Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Outputs Update #1- Gudrun Output File Organising #458

Merged
merged 24 commits into from
Oct 10, 2023
Merged

Conversation

rhinoella
Copy link
Contributor

@rhinoella rhinoella commented Oct 6, 2023

First stage of solving #457

Organises the files outputted by Gudrun in the following manner:

input_file_name/
 ├── SampleBackgrounds/
 |      ├── SampleBackground1/
 |              ├── NIMRODxxx/
 |                       ├── NIMRODxxx.rat
 |                       ├── NIMRODxxx.grp
 |                       ├── ....
 |
 ├── NormalisationBackground/
 |       ├── NIMRODxxx/
 |                 ├── ....
 |
 ├── Normalisation/
 |       ├── NIMRODxxx/
 |                ├── ....
 |
 ├── sample_name_1/
 |       ├── NIMRODxxx/
 |       |          ├── Outputs/
 |       |          |      ├── NIMRODxxx.rat
 |       |          |      ├── NIMRODxxx.grp
 |       |          |      ├── ....
 |       |          ├── Diagnostics/
 |       |                ├── NIMRODxxx.trans01
 |       |                ├── NIMRODxxx.gr2
 |       |                ├── ....
 |       ├── container_name/
 |       |          ├── ....
 |       ├── sample_name.sample

Every time Gudrun is run for a specified input file, it will use the same input_file_name folder, overriding the SampleBackgrounds, NormalisationBackground and Normalisation folders, but creating a new sample output folder.

If you iterate Gudrun, the sample folder will be structured like this:

 |
 ├── sample_name_2/
 |      ├── IterateByXX_1/
 |      |          ├── NIMRODxxx/
 |      |          |         ├── ....
 |      |          ├── container_name/
 |      |          |         ├── ....
 |      |          ├── sample_name.sample
 |      |                   ├── ....
 |      ├── IterateByXX_2/
 |                ├── ....

@rhinoella rhinoella requested a review from trisyoungs October 6, 2023 12:23
@github-actions
Copy link

github-actions bot commented Oct 6, 2023

Test Results

    3 files      3 suites   1h 0m 11s ⏱️
  92 tests   92 ✔️ 0 💤 0
276 runs  276 ✔️ 0 💤 0

Results for commit 3352fc4.

♻️ This comment has been updated with latest results.

Copy link
Member

@trisyoungs trisyoungs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, and I like the new directory layout of the output files.

One question to maybe just have a quick chat about - where are the lists of file types that are considered "diagnostic" vs "output" stored? Might be nice to check those through before we merge ahead.

@rhinoella
Copy link
Contributor Author

Looks good, and I like the new directory layout of the output files.

One question to maybe just have a quick chat about - where are the lists of file types that are considered "diagnostic" vs "output" stored? Might be nice to check those through before we merge ahead.

They are specified right here:

self.Outputs = {
"sampleOutputs": [
"dcs01",
"dcsd01",
"dcse01",
"dcst01",
"dscw01",
"mdcs01",
"mdcsd01",
"mdcse01",
"mdcsw01",
"mint01",
"mgor01",
"mdor01",
"gud",
"sample"
],
"sampleDiagnostics": [
"abs01",
"bak",
"gr1",
"gr2",
"mul01",
"mut01",
"pla01",
"rawmon",
"smomon",
"trans01"
],

@trisyoungs

rhinoella and others added 2 commits October 9, 2023 10:06
* Changed pyinstaller version

* Clearing cache

* Purging cache cross platform
@rhinoella rhinoella merged commit bedfb02 into develop Oct 10, 2023
@rhinoella rhinoella deleted the outputs-fix branch October 10, 2023 14:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants