From c03a5bc317bf75f15e228570c19b6a9e6c52de06 Mon Sep 17 00:00:00 2001 From: Suter Andreas Date: Fri, 22 Aug 2014 17:15:54 +0200 Subject: [PATCH] small inconsitency fix in path file name generation --- doc/html/user/MUSR/BmwLibs.html | 10 ++++----- doc/html/user/MUSR/LibFitPofB.html | 10 ++++----- doc/html/user/MUSR/LibZFRelaxation.html | 10 ++++----- doc/html/user/MUSR/Msr2Data.html | 12 +++++----- doc/html/user/MUSR/MusrFit.html | 22 +++++++++---------- .../user/MUSR/MusrFitAcknowledgements.html | 10 ++++----- doc/html/user/MUSR/MusrFitSetup.html | 10 ++++----- doc/html/user/MUSR/MusrGui.html | 12 +++++----- doc/html/user/MUSR/QuickStart.html | 10 ++++----- doc/html/user/MUSR/TutorialSingleHisto.html | 12 +++++----- doc/html/user/MUSR/WebHome.html | 10 ++++----- src/classes/PRunDataHandler.cpp | 4 ---- 12 files changed, 64 insertions(+), 68 deletions(-) diff --git a/doc/html/user/MUSR/BmwLibs.html b/doc/html/user/MUSR/BmwLibs.html index da9601fe..ffbae1c8 100644 --- a/doc/html/user/MUSR/BmwLibs.html +++ b/doc/html/user/MUSR/BmwLibs.html @@ -1,6 +1,6 @@ - + @@ -8,7 +8,7 @@ - + @@ -105,7 +105,7 @@ pre {
-
MUSR » MusrFit » BmwLibsPrint version
+
Print version

@@ -144,7 +144,7 @@ pre {
- Edit | Attach | Print version | PDF | History: r5 < r4 < r3 < r2 | Backlinks | View wiki text | Refresh | More topic actions + Edit | Attach | Print version | PDF | History: r5 < r4 < r3 < r2 | Backlinks | View wiki text | Refresh | More topic actions
Topic revision: r5 - 10 Jul 2011, wojek
@@ -195,7 +195,7 @@ pre {
- +

diff --git a/doc/html/user/MUSR/LibFitPofB.html b/doc/html/user/MUSR/LibFitPofB.html index a37cfcf8..a1fe1a17 100644 --- a/doc/html/user/MUSR/LibFitPofB.html +++ b/doc/html/user/MUSR/LibFitPofB.html @@ -1,6 +1,6 @@ - + @@ -8,7 +8,7 @@ - + @@ -105,7 +105,7 @@ pre {
-
MUSR » MusrFit » BmwLibs » LibFitPofBPrint version
+
Print version

@@ -420,7 +420,7 @@ An example XML file looks as follows:
- Edit | Attach | Print version | PDF | History: r16 < r15 < r14 < r13 | Backlinks | View wiki text | Refresh | More topic actions + Edit | Attach | Print version | PDF | History: r16 < r15 < r14 < r13 | Backlinks | View wiki text | Refresh | More topic actions
Topic revision: r16 - 10 Jul 2011, wojek
@@ -471,7 +471,7 @@ An example XML file looks as follows:
- +

diff --git a/doc/html/user/MUSR/LibZFRelaxation.html b/doc/html/user/MUSR/LibZFRelaxation.html index bffa062e..7faed20a 100644 --- a/doc/html/user/MUSR/LibZFRelaxation.html +++ b/doc/html/user/MUSR/LibZFRelaxation.html @@ -1,6 +1,6 @@ - + @@ -8,7 +8,7 @@ - + @@ -105,7 +105,7 @@ pre {
-
MUSR » MusrFit » BmwLibs » LibZFRelaxationPrint version
+
Print version

@@ -225,7 +225,7 @@ The parameters are:
    - Edit | Attach | Print version | PDF | History: r2 < r1 | Backlinks | View wiki text | Refresh | More topic actions + Edit | Attach | Print version | PDF | History: r2 < r1 | Backlinks | View wiki text | Refresh | More topic actions
Topic revision: r2 - 10 Jul 2011, wojek
@@ -276,7 +276,7 @@ The parameters are:
- +

diff --git a/doc/html/user/MUSR/Msr2Data.html b/doc/html/user/MUSR/Msr2Data.html index 99cb6f86..967c12f3 100644 --- a/doc/html/user/MUSR/Msr2Data.html +++ b/doc/html/user/MUSR/Msr2Data.html @@ -1,6 +1,6 @@ - + @@ -8,7 +8,7 @@ - + @@ -105,7 +105,7 @@ pre {
-
MUSR » MusrFit » Msr2DataPrint version
+
Print version

@@ -349,7 +349,7 @@ For reporting bugs or requesting new features and improvements please use the - @@ -422,7 +422,7 @@ For reporting bugs or requesting new features and improvements please use the
- +

diff --git a/doc/html/user/MUSR/MusrFit.html b/doc/html/user/MUSR/MusrFit.html index 6b8d44c7..a3851131 100644 --- a/doc/html/user/MUSR/MusrFit.html +++ b/doc/html/user/MUSR/MusrFit.html @@ -1,6 +1,6 @@ - + @@ -8,7 +8,7 @@ - + @@ -105,7 +105,7 @@ pre {
-
MUSR » MusrFitPrint version
+
Print version

@@ -787,20 +787,20 @@ The RUN block is used to collect the data needed for a particular run to be fitt The tokens following the RUN statement are used to identify the run, the potential location where the run might be found, and the file format in which the run data has been saved. In order to understand the meaning of all the above tokens, a short digression is needed.

-Where is musrfit looking for data files? There is a specific order how this is done:
    +Where is musrfit looking for data files? There is a specific order how this is done:
    1. Check if the file is found in the current directory
    2. Check if the path (or multiple paths) was (were) given in the XML startup file.
    3. Check if there is a system variable MUSRFULLDATAPATH. This system variable can contain multiple search paths separated by colons, e.g. 
       export MUSRFULLDATAPATH=/mnt/data/nemu/wkm/:/mnt/data/nemu/his/:/afs/psi.ch/user/s/smith/
    4. Construct the search path from the RUN-block information in the following way: Based on the RUN line in the RUN block, default paths will be generated, e.g. for 
      -RUN lem07_his_2018 MUE4 PSI ROOT-NPP
+RUN 2007/lem07_his_2018 MUE4 PSI ROOT-NPP
      the generated search path will look like 
      -musrFullDataPathToken/DATA/Facility/Beamline/Year/runName.ext
+musrFullDataPathToken/DATA/Facility/Beamline/runName.ext
      where musrFullDataPathToken is extracted from the MUSRFULLDATAPATH token by token, for the above example this might lead to the path 
       /afs/psi.ch/user/s/smith/DATA/PSI/MUE4/2007/lem07_his_2018.root
      -
+

Here are some valid examples for the first line of a RUN block:
 RUN 2007/lem07_his_2018 MUE4 PSI ROOT-NPP
@@ -1453,7 +1453,7 @@ For reporting bugs or requesting new features and improvements please use the 
 
 
-
Topic revision: r114 - 22 Aug 2014, AndreasSuter
@@ -1526,7 +1526,7 @@ For reporting bugs or requesting new features and improvements please use the
- +

diff --git a/doc/html/user/MUSR/MusrFitAcknowledgements.html b/doc/html/user/MUSR/MusrFitAcknowledgements.html index 9b92479b..dad31e35 100644 --- a/doc/html/user/MUSR/MusrFitAcknowledgements.html +++ b/doc/html/user/MUSR/MusrFitAcknowledgements.html @@ -1,6 +1,6 @@ - + @@ -8,7 +8,7 @@ - + @@ -105,7 +105,7 @@ pre {
-
MUSR » MusrFit » MusrFitAcknowledgementsPrint version
+
Print version

@@ -142,7 +142,7 @@ pre {
- Edit | Attach | Print version | PDF | History: r4 < r3 < r2 < r1 | Backlinks | View wiki text | Refresh | More topic actions + Edit | Attach | Print version | PDF | History: r4 < r3 < r2 < r1 | Backlinks | View wiki text | Refresh | More topic actions
Topic revision: r4 - 10 Jul 2011, wojek
@@ -193,7 +193,7 @@ pre {
- +

diff --git a/doc/html/user/MUSR/MusrFitSetup.html b/doc/html/user/MUSR/MusrFitSetup.html index 1bac6475..42a91445 100644 --- a/doc/html/user/MUSR/MusrFitSetup.html +++ b/doc/html/user/MUSR/MusrFitSetup.html @@ -1,6 +1,6 @@ - + @@ -8,7 +8,7 @@ - + @@ -105,7 +105,7 @@ pre {
-
MUSR » MusrFit » MusrFitSetupPrint version
+
Print version

@@ -830,7 +830,7 @@ musrview test-histo-ROOT-NPP.msr
- Edit | Attach | Print version | PDF | History: r56 < r55 < r54 < r53 | Backlinks | View wiki text | Refresh | More topic actions + Edit | Attach | Print version | PDF | History: r56 < r55 < r54 < r53 | Backlinks | View wiki text | Refresh | More topic actions
Topic revision: r56 - 09 May 2014, AndreasSuter
@@ -881,7 +881,7 @@ musrview test-histo-ROOT-NPP.msr
- +

diff --git a/doc/html/user/MUSR/MusrGui.html b/doc/html/user/MUSR/MusrGui.html index 2b24697b..4a533721 100644 --- a/doc/html/user/MUSR/MusrGui.html +++ b/doc/html/user/MUSR/MusrGui.html @@ -1,6 +1,6 @@ - + @@ -8,7 +8,7 @@ - + @@ -105,7 +105,7 @@ pre {
-
MUSR » MusrFit » MusrGuiPrint version
+
Print version

@@ -324,7 +324,7 @@ For reporting bugs or requesting new features and improvements please use the - @@ -397,7 +397,7 @@ For reporting bugs or requesting new features and improvements please use the
- +

diff --git a/doc/html/user/MUSR/QuickStart.html b/doc/html/user/MUSR/QuickStart.html index 418feb0d..7ac2c6f0 100644 --- a/doc/html/user/MUSR/QuickStart.html +++ b/doc/html/user/MUSR/QuickStart.html @@ -1,6 +1,6 @@ - + @@ -8,7 +8,7 @@ - + @@ -105,7 +105,7 @@ pre {
-
MUSR » MusrFit » QuickStartPrint version
+
Print version

@@ -280,7 +280,7 @@ RUN 2008/lem08_his_8472 MUE4 PSI ROOT-NPP (name beamline institute dat
- Edit | Attach | Print version | PDF | History: r7 < r6 < r5 < r4 | Backlinks | View wiki text | Refresh | More topic actions + Edit | Attach | Print version | PDF | History: r7 < r6 < r5 < r4 | Backlinks | View wiki text | Refresh | More topic actions
Topic revision: r7 - 10 Jul 2011, wojek
@@ -331,7 +331,7 @@ RUN 2008/lem08_his_8472 MUE4 PSI ROOT-NPP (name beamline institute dat
- +

diff --git a/doc/html/user/MUSR/TutorialSingleHisto.html b/doc/html/user/MUSR/TutorialSingleHisto.html index 83df529c..e354fc6d 100644 --- a/doc/html/user/MUSR/TutorialSingleHisto.html +++ b/doc/html/user/MUSR/TutorialSingleHisto.html @@ -1,6 +1,6 @@ - + @@ -8,7 +8,7 @@ - + @@ -105,7 +105,7 @@ pre {
-
MUSR » TutorialSingleHistoPrint version
+
Print version

@@ -281,7 +281,7 @@ This page only summarizes the very basic features and options of the programs co -
+

Attachments (6)

 
@@ -303,7 +303,7 @@ This page only summarizes the very basic features and options of the programs co
- Edit | Attach | Print version | PDF | History: r9 < r8 < r7 < r6 | Backlinks | View wiki text | Refresh | More topic actions + Edit | Attach | Print version | PDF | History: r9 < r8 < r7 < r6 | Backlinks | View wiki text | Refresh | More topic actions
Topic revision: r9 - 02 Sep 2011, wojek
@@ -354,7 +354,7 @@ This page only summarizes the very basic features and options of the programs co
- +

diff --git a/doc/html/user/MUSR/WebHome.html b/doc/html/user/MUSR/WebHome.html index d4929216..3ae90265 100644 --- a/doc/html/user/MUSR/WebHome.html +++ b/doc/html/user/MUSR/WebHome.html @@ -1,6 +1,6 @@ - + @@ -8,7 +8,7 @@ - + @@ -105,7 +105,7 @@ pre {
-
MUSRPrint version
+
Print version

@@ -156,7 +156,7 @@ pre {
- Edit | Attach | Print version | PDF | History: r43 < r42 < r41 < r40 | Backlinks | View wiki text | Refresh | More topic actions + Edit | Attach | Print version | PDF | History: r43 < r42 < r41 < r40 | Backlinks | View wiki text | Refresh | More topic actions
Topic revision: r43 - 09 May 2014, AndreasSuter
@@ -207,7 +207,7 @@ pre {
- +

diff --git a/src/classes/PRunDataHandler.cpp b/src/classes/PRunDataHandler.cpp index eb438365..1f3b0d93 100644 --- a/src/classes/PRunDataHandler.cpp +++ b/src/classes/PRunDataHandler.cpp @@ -1057,15 +1057,11 @@ Bool_t PRunDataHandler::FileExistsCheck(PMsrRunBlock &runInfo, const UInt_t idx) } pstr->ToUpper(); runInfo.SetBeamline(*pstr, idx); - TDatime datetime; - TString dt; - dt += datetime.GetYear(); for (Int_t i=0; iGetEntries(); i++) { ostr = dynamic_cast(tokens->At(i)); str = ostr->GetString() + TString("/DATA/") + *runInfo.GetInstitute(idx) + TString("/") + *runInfo.GetBeamline(idx) + TString("/") + - dt + TString("/") + *runInfo.GetRunName(idx); TestFileName(str, ext); if (!str.IsNull()) { // found