Index: trunk/MagicSoft/Mars/Changelog =================================================================== --- trunk/MagicSoft/Mars/Changelog (revision 5309) +++ trunk/MagicSoft/Mars/Changelog (revision 5310) @@ -20,4 +20,86 @@ -*-*- END OF LINE -*-*- + 2004/10/22: Thomas Bretz + + * callisto.cc, star.cc: + - commented out some checks which became obsolete with some new + features. I'll think of a more convinient check in the future + + * mbase/MDirIter.[h,cc]: + - added MakeRegexp which is used instead of TRegexp::MakeWildcard + to support better handling of regular expressions + + * mbase/MRunIter.cc: + - a small simplification + + * mbase/MStatusDisplay.cc: + - fixed a bug in CloseWindow (never use a data member after you + delete 'this') + + * mbase/MTaskEnv.cc: + - call ReadEnv also if task is the 'external' one + + * mcalib/MCalibrateRelTimes.cc: + - check for unsuitability for run AND event + + * mhist/MHCamera.cc: + - fixed the cases in which GetBinError returned NaN + + * mjobs/MJCalibrateSignal.[h,cc]: + - implemented reading raw-data + - implemented new scheme to setup MDirIter by MSequence + + * mjobs/MJCalibration.[h,cc]: + - fixed workaround + - implemented new scheme to setup MDirIter by MSequence + + * mjobs/MJPedestal.cc: + - implemented new scheme to setup MDirIter by MSequence + + * mjobs/MSequence.[h,cc]: + - changed SetupCalls to new scheme allowing to set the file type id + + * mmain/MEventDisplay.cc: + - fixed a crash if file is invalid + + * mraw/MRawFileRead.[h,cc]: + - replaced default name MRawFileRead by MRead to support MJ* + - added IsFileValid + + * msignal/MExtractTime.cc: + - fixed call to base ReInit (return value was ignored) + + * msignal/MExtractTimeAndCharge.[h,cc]: + - fixed some output + - added Print + - fixed call to base ReInit (return value was ignored) + - set Version Number to 1 + + * msignal/MExtractTimeAndChargeDigitalFilter.[h,cc]: + - added Print + + + + 2004/10/21: Thomas Bretz + + * star.cc: + - added a missing 'return -1' + + * mbase/MLog.cc: + - expanded path before opening ofstream + + * mfbase/MF.cc: + - added a comment + + * mhbase/MH3.cc: + - fixed behaviour of projections in status-display + + * mhflux/MHAlpha.cc: + - fixed TLatex output + + * mhflux/MHFalseSource.[h,cc]: + - replaced cut in L/D by D/W (which is more physical) + + 2004/10/21: Markus Gaug @@ -26,4 +108,5 @@ - fixed a bug occurring in the case that the colour changes in one same MRunIter. Returns now kFALSE instead of kCONTINUE + Index: trunk/MagicSoft/Mars/mjobs/MJCalibration.cc =================================================================== --- trunk/MagicSoft/Mars/mjobs/MJCalibration.cc (revision 5309) +++ trunk/MagicSoft/Mars/mjobs/MJCalibration.cc (revision 5310) @@ -1727,4 +1727,7 @@ tlist.PrintStatistics(); + if (!fCalibrationPINDiode.IsValid()) + SetUsePINDiode(kFALSE); + DisplayResult(plist); Index: trunk/MagicSoft/Mars/mjobs/MSequence.cc =================================================================== --- trunk/MagicSoft/Mars/mjobs/MSequence.cc (revision 5309) +++ trunk/MagicSoft/Mars/mjobs/MSequence.cc (revision 5310) @@ -134,5 +134,5 @@ } -Int_t MSequence::SetupRuns(MDirIter &iter, const TArrayI &arr, const char *path, Bool_t raw) const +Int_t MSequence::SetupRuns(MDirIter &iter, const TArrayI &arr, const char *path, char *id, Bool_t raw) const { TString d(path); @@ -146,11 +146,18 @@ } + cout << d << endl; + for (int i=0; i35487 ? "%08d_%s_*_E" : "%05d_%s_*_E"; + TString n; // Create file name n = fNight.GetStringFmt("%Y%m%d_"); - n += Form("%05d_*_E", arr[i]); + n += Form(fmt, arr[i], id); n += raw ? ".raw" : ".root"; @@ -249,7 +256,7 @@ // Return the number of files added. // -Int_t MSequence::SetupPedRuns(MDirIter &iter, const char *path, Bool_t raw) const -{ - return SetupRuns(iter, fPedRuns, path, raw); +Int_t MSequence::SetupPedRuns(MDirIter &iter, const char *path, char *id, Bool_t raw) const +{ + return SetupRuns(iter, fPedRuns, path, id, raw); } @@ -262,7 +269,7 @@ // Return the number of files added. // -Int_t MSequence::SetupDatRuns(MDirIter &iter, const char *path, Bool_t raw) const -{ - return SetupRuns(iter, fDatRuns, path, raw); +Int_t MSequence::SetupDatRuns(MDirIter &iter, const char *path, char *id, Bool_t raw) const +{ + return SetupRuns(iter, fDatRuns, path, id, raw); } @@ -275,7 +282,7 @@ // Return the number of files added. // -Int_t MSequence::SetupAllRuns(MDirIter &iter, const char *path, Bool_t raw) const -{ - return SetupRuns(iter, fRuns, path, raw); +Int_t MSequence::SetupAllRuns(MDirIter &iter, const char *path, char *id, Bool_t raw) const +{ + return SetupRuns(iter, fRuns, path, id, raw); } @@ -288,6 +295,6 @@ // Return the number of files added. // -Int_t MSequence::SetupCalRuns(MDirIter &iter, const char *path, Bool_t raw) const -{ - return SetupRuns(iter, fCalRuns, path, raw); -} +Int_t MSequence::SetupCalRuns(MDirIter &iter, const char *path, char *id, Bool_t raw) const +{ + return SetupRuns(iter, fCalRuns, path, id, raw); +} Index: trunk/MagicSoft/Mars/mjobs/MSequence.h =================================================================== --- trunk/MagicSoft/Mars/mjobs/MSequence.h (revision 5309) +++ trunk/MagicSoft/Mars/mjobs/MSequence.h (revision 5310) @@ -36,5 +36,5 @@ void Split(TString &runs, TArrayI &data) const; - Int_t SetupRuns(MDirIter &iter, const TArrayI &arr, const char *path, Bool_t raw=kFALSE) const; + Int_t SetupRuns(MDirIter &iter, const TArrayI &arr, const char *path, char *id, Bool_t raw=kFALSE) const; public: @@ -53,8 +53,8 @@ Bool_t IsValid() const { return fSequence!=(UInt_t)-1; } - Int_t SetupPedRuns(MDirIter &iter, const char *path=0, Bool_t raw=kFALSE) const; - Int_t SetupDatRuns(MDirIter &iter, const char *path=0, Bool_t raw=kFALSE) const; - Int_t SetupAllRuns(MDirIter &iter, const char *path=0, Bool_t raw=kFALSE) const; - Int_t SetupCalRuns(MDirIter &iter, const char *path=0, Bool_t raw=kFALSE) const; + Int_t SetupPedRuns(MDirIter &iter, const char *path=0, char *id="P", Bool_t raw=kFALSE) const; + Int_t SetupDatRuns(MDirIter &iter, const char *path=0, char *id="D", Bool_t raw=kFALSE) const; + Int_t SetupAllRuns(MDirIter &iter, const char *path=0, char *id="?", Bool_t raw=kFALSE) const; + Int_t SetupCalRuns(MDirIter &iter, const char *path=0, char *id="C", Bool_t raw=kFALSE) const; Int_t GetNumAllRuns() const { return fRuns.GetSize(); }