diff --git a/doc/html/user/MUSR/BmwLibs.html b/doc/html/user/MUSR/BmwLibs.html index 97119e333..b747dd89c 100644 --- a/doc/html/user/MUSR/BmwLibs.html +++ b/doc/html/user/MUSR/BmwLibs.html @@ -1,6 +1,6 @@ - + @@ -8,7 +8,7 @@ - + @@ -115,6 +115,8 @@ pre {

+

+

To be written...

BMWlibs for musrfit

Topic revision: r5 - 10 Jul 2011, wojek
@@ -181,10 +183,6 @@ pre {

-

@@ -194,7 +192,7 @@ pre { - +

diff --git a/doc/html/user/MUSR/CiteMusrFit.html b/doc/html/user/MUSR/CiteMusrFit.html index 13eee7f61..0cb0a7b79 100644 --- a/doc/html/user/MUSR/CiteMusrFit.html +++ b/doc/html/user/MUSR/CiteMusrFit.html @@ -1,6 +1,6 @@ - + @@ -8,7 +8,7 @@ - + @@ -115,6 +115,8 @@ pre {

+

+

How to Cite musrfit?

Since quite some effort is going into the development and maintenance of the musrfit package, you should at least acknowledge it in your publication if you have used it to analyze your data. Even better of course is to cite it properly by the reference given beneath @@ -142,7 +144,7 @@ Since quite some effort is going into the development and maintenance of the
- 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 - 19 Jun 2012, AndreasSuter
@@ -179,10 +181,6 @@ Since quite some effort is going into the development and maintenance of the

-

@@ -192,7 +190,7 @@ Since quite some effort is going into the development and maintenance of the - +

diff --git a/doc/html/user/MUSR/LibFitPofB.html b/doc/html/user/MUSR/LibFitPofB.html index b32636999..224e90823 100644 --- a/doc/html/user/MUSR/LibFitPofB.html +++ b/doc/html/user/MUSR/LibFitPofB.html @@ -1,6 +1,6 @@ - + @@ -8,7 +8,7 @@ - + @@ -115,6 +115,8 @@ pre {

+

+

libFitPofB

@@ -420,7 +422,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
@@ -457,10 +459,6 @@ An example XML file looks as follows:

-

@@ -470,7 +468,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 3f8ac8155..6f5336b36 100644 --- a/doc/html/user/MUSR/LibZFRelaxation.html +++ b/doc/html/user/MUSR/LibZFRelaxation.html @@ -1,6 +1,6 @@ - + @@ -8,7 +8,7 @@ - + @@ -115,6 +115,8 @@ pre {

+

+

libZFRelaxation

@@ -225,7 +227,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
@@ -262,10 +264,6 @@ The parameters are:

      -
    • -
    • -
    -

    @@ -275,7 +273,7 @@ The parameters are:
      - +

      diff --git a/doc/html/user/MUSR/Msr2Data.html b/doc/html/user/MUSR/Msr2Data.html index 3f264332b..4266886a1 100644 --- a/doc/html/user/MUSR/Msr2Data.html +++ b/doc/html/user/MUSR/Msr2Data.html @@ -1,6 +1,6 @@ - + @@ -8,7 +8,7 @@ - + @@ -115,6 +115,8 @@ pre {

      +

      +

      msr2data

      @@ -349,7 +351,7 @@ For reporting bugs or requesting new features and improvements please use the - @@ -408,10 +410,6 @@ For reporting bugs or requesting new features and improvements please use the Paul Scherrer Institut

        -
      • -
      • -
      -

      @@ -421,7 +419,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 33099c71e..f3e74c9d8 100644 --- a/doc/html/user/MUSR/MusrFit.html +++ b/doc/html/user/MUSR/MusrFit.html @@ -1,6 +1,6 @@ - + @@ -8,7 +8,7 @@ - + @@ -115,6 +115,8 @@ pre {

      +

      +

      musrfit User Manual

      @@ -387,6 +389,7 @@ Since the goal was to create a very flexible converter tool, it has ample of opt
      -r <runList-input>
      where <runList-input> is a list of run numbers separated by spaces of the form: <run1> <run2> <run3> etc., or a sequence of runs <runStart>-<runEnd>, e.g. 111-123. This option cannot be combined with -f and vice versa.
      -t <in-template> <out-template>
      where <in-/out-template> are templates to generate real file names from run numbers. The following template tags can be used: [yy] for year, and [rrrr] for the run number. If the run number tag is used, the number of 'r' will give the number of digits used with leading zeros, e.g. [rrrrrr] and run 123 will result in 000123. Similarly [yyyy] will result in something like 1999, whereas [yy] into something like 99. For more details best check the examples below.
      -c <in-Format> <out-Format>
      this is used to tell any2many what is the input-file-format and into which output-file-format the data shall be converted. The possible input-/output-file-formats are listed above. +
      -h <histo-group-list>
      This option is for MusrRoot input files only! Select the the histo groups to be exported. <histo-group-list> is a space separated list of the histo group, e.g. -h 0, 20 will try to export the histo 0 (NPP) and 20 (PPC). A histo-group is defined via the RedGreen offset in the MusrRoot file format. It is used e.g. in red/green mode measurements. If this option is omitted in a conversion from MusrRoot to something, the first group will exported only!
      -p <output-path>
      where <output-path> is the output path for the converted files. If no <output-path> is given, the current directory will be used, unless the option -s is used.
      -y <year>
      here a <year> in the form yy or yyyy can be given. If this is the case, any automatic file name generation which needs a year will use this given one.
      -s
      with this option the output data file will be sent to the stdout. It is intended to be used together with web applications. @@ -828,6 +831,11 @@ The currently supported GLOBAL block entries are:
      Topic revision: r124 - 23 Feb 2015, AndreasSuter
      +
      Topic revision: r126 - 29 May 2015, AndreasSuter
      @@ -1639,10 +1647,6 @@ For reporting bugs or requesting new features and improvements please use the Paul Scherrer Institut

        -
      • -
      • -
      -

      @@ -1652,7 +1656,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 a55d42dff..4ca690467 100644 --- a/doc/html/user/MUSR/MusrFitAcknowledgements.html +++ b/doc/html/user/MUSR/MusrFitAcknowledgements.html @@ -1,6 +1,6 @@ - + @@ -8,7 +8,7 @@ - + @@ -115,6 +115,8 @@ pre {

      +

      +

      Acknowledgements - musrfit

      Bastian M. Wojek
      I am very much indebted to BMW for his rigorous testing of musrfit, his many useful suggestions, contributions, and for the largest part of the user manual of musrfit which makes it accessible to a broader audience! Many thanks Bastian! @@ -142,7 +144,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
      @@ -179,10 +181,6 @@ pre {

        -
      • -
      • -
      -

      @@ -192,7 +190,7 @@ pre { - +

      diff --git a/doc/html/user/MUSR/MusrFitSetup.html b/doc/html/user/MUSR/MusrFitSetup.html index b1bb4f096..e1c4458f0 100644 --- a/doc/html/user/MUSR/MusrFitSetup.html +++ b/doc/html/user/MUSR/MusrFitSetup.html @@ -1,6 +1,6 @@ - + @@ -8,7 +8,7 @@ - + @@ -115,6 +115,8 @@ pre {

      +

      +

      Setting up musrfit on Different Platforms

      Topic revision: r60 - 25 Oct 2014, AndreasSuter
      @@ -883,10 +885,6 @@ musrview test-histo-ROOT-NPP.msr

        -
      • -
      • -
      -

      @@ -896,7 +894,7 @@ musrview test-histo-ROOT-NPP.msr - +

      diff --git a/doc/html/user/MUSR/MusrGui.html b/doc/html/user/MUSR/MusrGui.html index 00e0dc696..3e3fe0ab4 100644 --- a/doc/html/user/MUSR/MusrGui.html +++ b/doc/html/user/MUSR/MusrGui.html @@ -1,6 +1,6 @@ - + @@ -8,7 +8,7 @@ - + @@ -115,6 +115,8 @@ pre {

      +

      +

      musredit / (musrgui)

      @@ -327,7 +329,7 @@ For reporting bugs or requesting new features and improvements please use the - @@ -386,10 +388,6 @@ For reporting bugs or requesting new features and improvements please use the Paul Scherrer Institut

        -
      • -
      • -
      -

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

      diff --git a/doc/html/user/MUSR/MusrRoot.html b/doc/html/user/MUSR/MusrRoot.html index b81830ac8..fd8e52e11 100644 --- a/doc/html/user/MUSR/MusrRoot.html +++ b/doc/html/user/MUSR/MusrRoot.html @@ -1,6 +1,6 @@ - + @@ -8,7 +8,7 @@ - + @@ -115,6 +115,8 @@ pre {

      +

      +

      MusrRoot

      @@ -1038,7 +1040,7 @@ Result in the RunHeader/SampleEnvironmentInfo: -
      +

      Attachments (2)

       
      @@ -1060,7 +1062,7 @@ Result in the RunHeader/SampleEnvironmentInfo:
      - 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 - 29 Mar 2012, AndreasSuter
      @@ -1097,10 +1099,6 @@ Result in the RunHeader/SampleEnvironmentInfo:

        -
      • -
      • -
      -

      @@ -1110,7 +1108,7 @@ Result in the RunHeader/SampleEnvironmentInfo:
      - +

      diff --git a/doc/html/user/MUSR/QuickStart.html b/doc/html/user/MUSR/QuickStart.html index 51ed59d01..d424e3288 100644 --- a/doc/html/user/MUSR/QuickStart.html +++ b/doc/html/user/MUSR/QuickStart.html @@ -1,6 +1,6 @@ - + @@ -8,7 +8,7 @@ - + @@ -115,6 +115,8 @@ pre {

      +

      +

      Quickstart for WKM users

      Topic revision: r7 - 10 Jul 2011, wojek
      @@ -317,10 +319,6 @@ RUN 2008/lem08_his_8472 MUE4 PSI ROOT-NPP (name beamline institute dat

        -
      • -
      • -
      -

      @@ -330,7 +328,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 e9a6f1541..fba0a695e 100644 --- a/doc/html/user/MUSR/TutorialSingleHisto.html +++ b/doc/html/user/MUSR/TutorialSingleHisto.html @@ -1,6 +1,6 @@ - + @@ -8,7 +8,7 @@ - + @@ -115,6 +115,8 @@ pre {

      +

      +

      musrfit Single-Histogram-Fit Tutorial

      The μSR-data-analysis process using musrfit is based on so-called msr files. These files contain all information needed for the analysis such as names of the data files, a theory function, fit and plot parameters, and so on. It is the idea of this page to explain the basic use of an msr file and the different programs of the musrfit suite using the example of a single-histogram fit to time-differential transverse-field μSR data. For a complete description of all options please refer to the manual. @@ -281,7 +283,7 @@ This page only summarizes the very basic features and options of the programs co -
      +

      Attachments (6)

       
      @@ -303,7 +305,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
      @@ -340,10 +342,6 @@ This page only summarizes the very basic features and options of the programs co

        -
      • -
      • -
      -

      @@ -353,7 +351,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 77ceaaaac..6f89856ea 100644 --- a/doc/html/user/MUSR/WebHome.html +++ b/doc/html/user/MUSR/WebHome.html @@ -1,6 +1,6 @@ - + @@ -8,7 +8,7 @@ - + @@ -115,6 +115,8 @@ pre {

      +

      +

      Welcome to the MUSR web

      Documentation of the μSR data analysis suite musrfit

      --- AS & (BMW) - last update Feb 19, 2015
      +-- AS & (BMW) - last update May 29, 2015
      @@ -156,9 +158,9 @@ pre {
      - Edit | Attach | Print version | PDF | History: r49 < r48 < r47 < r46 | Backlinks | View wiki text | Refresh | More topic actions + Edit | Attach | Print version | PDF | History: r50 < r49 < r48 < r47 | Backlinks | View wiki text | Refresh | More topic actions
      -
      Topic revision: r49 - 19 Feb 2015, AndreasSuter
      +
      Topic revision: r50 - 29 May 2015, AndreasSuter
      @@ -193,10 +195,6 @@ pre {

        -
      • -
      • -
      -

      @@ -206,7 +204,7 @@ pre {
      - +

      diff --git a/src/any2many.cpp b/src/any2many.cpp index 652b04217..0fb896fa6 100644 --- a/src/any2many.cpp +++ b/src/any2many.cpp @@ -54,7 +54,7 @@ using namespace std; void any2many_syntax() { cout << endl << "usage: any2many [--help] : will show this help."; - cout << endl << " any2many --version : will show the svn version."; + cout << endl << " any2many --version : will show the git version."; cout << endl << " any2many -f | -r "; cout << endl << " -c [-p ] [-y ]"; cout << endl << " [-o | -t ] [-s]"; @@ -83,6 +83,10 @@ void any2many_syntax() cout << endl << " NeXus2-HDF4, NeXus2-HDF5, NeXus2-XML, WKM, ASCII"; cout << endl << " Comment: ROOT is superseeded by MusrRoot. If there is not a very good"; cout << endl << " reason, avoid it!"; + cout << endl << " -h : This option is for MusrRoot input files only!"; + cout << endl << " Select the the histo groups to be exported. is a space"; + cout << endl << " separated list of the histo group, e.g. -h 0, 20 will try to export the histo"; + cout << endl << " 0 (NPP) and 20 (PPC)."; cout << endl << " -p : where is the output path for the"; cout << endl << " converted files. If nothing is given, the current directory"; cout << endl << " will be used, unless the option '-s' is used."; @@ -190,7 +194,7 @@ int main(int argc, char *argv[]) // call any2many --help or any2many --version if (argc == 2) { - if (strstr(argv[1], "--h")) + if (!strncmp(argv[1], "--help", 128)) any2many_syntax(); else if (strstr(argv[1], "--v")) { #ifdef HAVE_CONFIG_H @@ -344,6 +348,21 @@ int main(int argc, char *argv[]) show_syntax = true; break; } + } else if (!strcmp(argv[i], "-h")) { // filter histo group list (for MusrRoot and ROOT (LEM) only!) + bool done = false; + int j = i+1; + do { + status = sscanf(argv[j], "%d", &ival); + if (status == 1) { + info.groupHistoList.push_back(ival); + j++; + } else { + done = true; + } + } while (!done && (j= argc) // make sure that counter is still in range + break; } else if (!strcmp(argv[i], "-p")) { // filter output path name flag if (i+1 < argc) { info.outPath = argv[i+1]; diff --git a/src/classes/PRunDataHandler.cpp b/src/classes/PRunDataHandler.cpp index 3cd0e4f3f..1ae6e0fb3 100644 --- a/src/classes/PRunDataHandler.cpp +++ b/src/classes/PRunDataHandler.cpp @@ -1734,8 +1734,33 @@ Bool_t PRunDataHandler::ReadRootFile() header->Get("RunInfo/RedGreen Offsets", ivec, ok); if (ok) { - redGreenOffsets = ivec; - runData.SetRedGreenOffset(ivec); + // check if any2many is used and a group histo list is defined, if NOT, only take the 0-offset data! + if (fAny2ManyInfo) { // i.e. any2many is called + if (fAny2ManyInfo->groupHistoList.size() == 0) { // NO group list defined -> use only the 0-offset data + redGreenOffsets.push_back(0); + } else { // group list defined + // make sure that the group list elements is a subset of present RedGreen offsets + Bool_t found = false; + for (UInt_t i=0; igroupHistoList.size(); i++) { + found = false; + for (UInt_t j=0; jgroupHistoList[i] == ivec[i]) + found = true; + } + if (!found) { + cerr << endl << ">> PRunDataHandler::ReadRootFile: **ERROR** requested histo group " << fAny2ManyInfo->groupHistoList[i]; + cerr << endl << ">> which is NOT present in the data file." << endl; + return false; + } + } + // found all requested histo groups, hence stuff it to the right places + redGreenOffsets = fAny2ManyInfo->groupHistoList; + runData.SetRedGreenOffset(fAny2ManyInfo->groupHistoList); + } + } else { // not any2many, i.e. musrfit, musrview, ... + redGreenOffsets = ivec; + runData.SetRedGreenOffset(ivec); + } } // check further for LEM specific stuff in RunInfo diff --git a/src/include/PMusr.h b/src/include/PMusr.h index 8a501d59e..44ca16c7d 100644 --- a/src/include/PMusr.h +++ b/src/include/PMusr.h @@ -780,6 +780,7 @@ typedef struct { TString outTemplate; ///< holds the output file template TString year; ///< holds the information about the year to be used PIntVector runList; ///< holds the run number list to be converted + PIntVector groupHistoList; ///< holds the histo group list offset (used to define for MusrRoot files, what to be exported) PStringVector inFileName; ///< holds the file name of the input data file TString outFileName; ///< holds the output file name PStringVector outPathFileName; ///< holds the out path/file name