Changeset 5310
- Timestamp:
- 10/22/04 18:06:24 (20 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r5303 r5310 20 20 -*-*- END OF LINE -*-*- 21 21 22 2004/10/22: Thomas Bretz 23 24 * callisto.cc, star.cc: 25 - commented out some checks which became obsolete with some new 26 features. I'll think of a more convinient check in the future 27 28 * mbase/MDirIter.[h,cc]: 29 - added MakeRegexp which is used instead of TRegexp::MakeWildcard 30 to support better handling of regular expressions 31 32 * mbase/MRunIter.cc: 33 - a small simplification 34 35 * mbase/MStatusDisplay.cc: 36 - fixed a bug in CloseWindow (never use a data member after you 37 delete 'this') 38 39 * mbase/MTaskEnv.cc: 40 - call ReadEnv also if task is the 'external' one 41 42 * mcalib/MCalibrateRelTimes.cc: 43 - check for unsuitability for run AND event 44 45 * mhist/MHCamera.cc: 46 - fixed the cases in which GetBinError returned NaN 47 48 * mjobs/MJCalibrateSignal.[h,cc]: 49 - implemented reading raw-data 50 - implemented new scheme to setup MDirIter by MSequence 51 52 * mjobs/MJCalibration.[h,cc]: 53 - fixed workaround 54 - implemented new scheme to setup MDirIter by MSequence 55 56 * mjobs/MJPedestal.cc: 57 - implemented new scheme to setup MDirIter by MSequence 58 59 * mjobs/MSequence.[h,cc]: 60 - changed SetupCalls to new scheme allowing to set the file type id 61 62 * mmain/MEventDisplay.cc: 63 - fixed a crash if file is invalid 64 65 * mraw/MRawFileRead.[h,cc]: 66 - replaced default name MRawFileRead by MRead to support MJ* 67 - added IsFileValid 68 69 * msignal/MExtractTime.cc: 70 - fixed call to base ReInit (return value was ignored) 71 72 * msignal/MExtractTimeAndCharge.[h,cc]: 73 - fixed some output 74 - added Print 75 - fixed call to base ReInit (return value was ignored) 76 - set Version Number to 1 77 78 * msignal/MExtractTimeAndChargeDigitalFilter.[h,cc]: 79 - added Print 80 81 82 83 2004/10/21: Thomas Bretz 84 85 * star.cc: 86 - added a missing 'return -1' 87 88 * mbase/MLog.cc: 89 - expanded path before opening ofstream 90 91 * mfbase/MF.cc: 92 - added a comment 93 94 * mhbase/MH3.cc: 95 - fixed behaviour of projections in status-display 96 97 * mhflux/MHAlpha.cc: 98 - fixed TLatex output 99 100 * mhflux/MHFalseSource.[h,cc]: 101 - replaced cut in L/D by D/W (which is more physical) 102 103 22 104 23 105 2004/10/21: Markus Gaug … … 26 108 - fixed a bug occurring in the case that the colour changes in one 27 109 same MRunIter. Returns now kFALSE instead of kCONTINUE 110 28 111 29 112 -
trunk/MagicSoft/Mars/mjobs/MJCalibration.cc
r5308 r5310 1727 1727 tlist.PrintStatistics(); 1728 1728 1729 if (!fCalibrationPINDiode.IsValid()) 1730 SetUsePINDiode(kFALSE); 1731 1729 1732 DisplayResult(plist); 1730 1733 -
trunk/MagicSoft/Mars/mjobs/MSequence.cc
r4920 r5310 134 134 } 135 135 136 Int_t MSequence::SetupRuns(MDirIter &iter, const TArrayI &arr, const char *path, Bool_t raw) const136 Int_t MSequence::SetupRuns(MDirIter &iter, const TArrayI &arr, const char *path, char *id, Bool_t raw) const 137 137 { 138 138 TString d(path); … … 146 146 } 147 147 148 cout << d << endl; 149 148 150 for (int i=0; i<arr.GetSize(); i++) 149 151 { 152 // R. DeLosReyes and T. Bretz 153 // Changes to read the DAQ numbering format. Changes takes place 154 // between runs 35487 and 00035488 (2004_08_30) 155 const char *fmt = arr[i]>35487 ? "%08d_%s_*_E" : "%05d_%s_*_E"; 156 150 157 TString n; 151 158 152 159 // Create file name 153 160 n = fNight.GetStringFmt("%Y%m%d_"); 154 n += Form( "%05d_*_E", arr[i]);161 n += Form(fmt, arr[i], id); 155 162 n += raw ? ".raw" : ".root"; 156 163 … … 249 256 // Return the number of files added. 250 257 // 251 Int_t MSequence::SetupPedRuns(MDirIter &iter, const char *path, Bool_t raw) const252 { 253 return SetupRuns(iter, fPedRuns, path, raw);258 Int_t MSequence::SetupPedRuns(MDirIter &iter, const char *path, char *id, Bool_t raw) const 259 { 260 return SetupRuns(iter, fPedRuns, path, id, raw); 254 261 } 255 262 … … 262 269 // Return the number of files added. 263 270 // 264 Int_t MSequence::SetupDatRuns(MDirIter &iter, const char *path, Bool_t raw) const265 { 266 return SetupRuns(iter, fDatRuns, path, raw);271 Int_t MSequence::SetupDatRuns(MDirIter &iter, const char *path, char *id, Bool_t raw) const 272 { 273 return SetupRuns(iter, fDatRuns, path, id, raw); 267 274 } 268 275 … … 275 282 // Return the number of files added. 276 283 // 277 Int_t MSequence::SetupAllRuns(MDirIter &iter, const char *path, Bool_t raw) const278 { 279 return SetupRuns(iter, fRuns, path, raw);284 Int_t MSequence::SetupAllRuns(MDirIter &iter, const char *path, char *id, Bool_t raw) const 285 { 286 return SetupRuns(iter, fRuns, path, id, raw); 280 287 } 281 288 … … 288 295 // Return the number of files added. 289 296 // 290 Int_t MSequence::SetupCalRuns(MDirIter &iter, const char *path, Bool_t raw) const291 { 292 return SetupRuns(iter, fCalRuns, path, raw);293 } 297 Int_t MSequence::SetupCalRuns(MDirIter &iter, const char *path, char *id, Bool_t raw) const 298 { 299 return SetupRuns(iter, fCalRuns, path, id, raw); 300 } -
trunk/MagicSoft/Mars/mjobs/MSequence.h
r4802 r5310 36 36 37 37 void Split(TString &runs, TArrayI &data) const; 38 Int_t SetupRuns(MDirIter &iter, const TArrayI &arr, const char *path, Bool_t raw=kFALSE) const;38 Int_t SetupRuns(MDirIter &iter, const TArrayI &arr, const char *path, char *id, Bool_t raw=kFALSE) const; 39 39 40 40 public: … … 53 53 Bool_t IsValid() const { return fSequence!=(UInt_t)-1; } 54 54 55 Int_t SetupPedRuns(MDirIter &iter, const char *path=0, Bool_t raw=kFALSE) const;56 Int_t SetupDatRuns(MDirIter &iter, const char *path=0, Bool_t raw=kFALSE) const;57 Int_t SetupAllRuns(MDirIter &iter, const char *path=0, Bool_t raw=kFALSE) const;58 Int_t SetupCalRuns(MDirIter &iter, const char *path=0, Bool_t raw=kFALSE) const;55 Int_t SetupPedRuns(MDirIter &iter, const char *path=0, char *id="P", Bool_t raw=kFALSE) const; 56 Int_t SetupDatRuns(MDirIter &iter, const char *path=0, char *id="D", Bool_t raw=kFALSE) const; 57 Int_t SetupAllRuns(MDirIter &iter, const char *path=0, char *id="?", Bool_t raw=kFALSE) const; 58 Int_t SetupCalRuns(MDirIter &iter, const char *path=0, char *id="C", Bool_t raw=kFALSE) const; 59 59 60 60 Int_t GetNumAllRuns() const { return fRuns.GetSize(); }
Note:
See TracChangeset
for help on using the changeset viewer.