diff --git a/ChangeLog b/ChangeLog index 8ecbf138..3899ebf3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ changes since 0.16.0 =================================== NEW 2016-01-22 update of the docu which now describes the RRF option. +CHANGED 2016-02-16 if the LEM file is created 2012 or later and the + data-file-format tag is still ROOT-NPP or ROOT-PPC, it + will automatically switched to MUSR-ROOT. This way red/green + issues should be prevented. (see MUSR-314). CHANGED 2016-02-16 start migrating the icons of musredit_qt5 to the breeze icons (https://github.com/NitruxSA/breeze-icon-theme). At the same time I start to redesign the musrfit specific diff --git a/src/classes/PRunDataHandler.cpp b/src/classes/PRunDataHandler.cpp index b95c46fb..97171de9 100644 --- a/src/classes/PRunDataHandler.cpp +++ b/src/classes/PRunDataHandler.cpp @@ -365,6 +365,10 @@ Bool_t PRunDataHandler::ReadFilesMsr() return false; } + char str[1024], *p_str=0; + UInt_t year=0; + TString musrRoot("musr-root"); + for (UInt_t i=0; isize(); i++) { for (UInt_t j=0; jat(i).GetRunNameSize(); j++) { fRunName = *(runList->at(i).GetRunName(j)); @@ -372,8 +376,17 @@ Bool_t PRunDataHandler::ReadFilesMsr() if (!FileExistsCheck(runList->at(i), j)) return false; + // get year from string if LEM data file + strcpy(str, fRunName.Data()); + p_str = strstr(str, "lem"); + if (p_str != 0) + sscanf(p_str, "lem%d_his", &year); + // check special case for ROOT-NPP/ROOT-PPC (LEM) if (!runList->at(i).GetFileFormat(j)->CompareTo("root-npp")) { // not post pile up corrected histos + // if LEM file header is already TMusrRoot, change the data-file-format + if (year >= 12) + runList->at(i).SetFileFormat(musrRoot, j); // check if forward/backward histoNo are within proper bounds, i.e. < PRH_PPC_OFFSET for (UInt_t k=0; kat(i).GetForwardHistoNoSize(); k++) { if (runList->at(i).GetForwardHistoNo(k) > PRH_PPC_OFFSET) @@ -384,6 +397,9 @@ Bool_t PRunDataHandler::ReadFilesMsr() runList->at(i).SetBackwardHistoNo(runList->at(i).GetBackwardHistoNo(k)-PRH_PPC_OFFSET, k); } } else if (!runList->at(i).GetFileFormat(j)->CompareTo("root-ppc")) { // post pile up corrected histos + // if LEM file header is already TMusrRoot, change the data-file-format + if (year >= 12) + runList->at(i).SetFileFormat(musrRoot, j); // check if forward/backward histoNo are within proper bounds, i.e. > PRH_PPC_OFFSET for (UInt_t k=0; kat(i).GetForwardHistoNoSize(); k++) { if (runList->at(i).GetForwardHistoNo(k) < PRH_PPC_OFFSET)