Changeset 4185 for trunk/MagicSoft/Mars/mtemp/mpisa
- Timestamp:
- 05/25/04 19:28:46 (21 years ago)
- Location:
- trunk/MagicSoft/Mars/mtemp/mpisa
- Files:
-
- 16 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/mtemp/mpisa/Changelog_pisa
r4157 r4185 18 18 19 19 -*-*- END OF LINE -*-*- 20 2004/05/24: Antonio Stamerra 21 22 * mpisa/classes/MTriggerLiveTime.[h.cc] 23 - added new class container for the Live-Deadtime from report files (.rep) 24 25 * mpisa/classes/mtrigger 26 - added new directory for the MTrigger* classes. These 27 classes have been moved there. 28 - Various modifications have been made on these classes. 29 The MReportTrigger now fills these containers. 30 20 31 2004/05/24: Antonio Stamerra 21 32 -
trunk/MagicSoft/Mars/mtemp/mpisa/classes/MReportTrigger.cc
r4157 r4185 34 34 #include "MReportTrigger.h" 35 35 36 #include "MParList.h" 37 36 38 #include "MLogManip.h" 37 39 #include "MTriggerIPR.h" 40 #include "MTriggerCell.h" 41 #include "MTriggerBit.h" 42 #include "MTriggerPrescFact.h" 43 #include "MTriggerLiveTime.h" 38 44 39 45 ClassImp(MReportTrigger); … … 45 51 // Default construtor. Initialize identifier to "TRIGGER-REPORT" 46 52 // 47 MReportTrigger::MReportTrigger() : MReport("TRIGGER-REPORT") , fPrescalerRates(19)53 MReportTrigger::MReportTrigger() : MReport("TRIGGER-REPORT") 48 54 { 49 55 fName = "MReportTrigger"; … … 76 82 if (!fPrescFactor) 77 83 return kFALSE; 84 85 fLiveTime = (MTriggerLiveTime*)plist.FindCreateObj("MTriggerLiveTime"); 86 if (!fLiveTime) 87 return kFALSE; 78 88 79 89 return MReport::SetupReading(plist); … … 83 93 // 84 94 // Interprete the Cell rates part of the report 85 // 86 Int_t MReportTrigger::InterpreteCell(TString &str) 87 { 95 // Read 32 floats separated with a blank 96 // 97 Bool_t MReportTrigger::InterpreteCell(TString &str) 98 { 99 Int_t len, n, i=0; 100 Int_t gsNCells=32; 101 102 const char *pos = str.Data(); 103 const char *end = str.Data() + gsNCells; 104 105 while (pos < end) 106 { 107 n = sscanf(pos, " %f %n", &fCell->fCellRate[i++], &len); 108 if (n!=1) 109 { 110 *fLog << warn << "WARNING - Cell Scaler Value #" << i << " missing." << endl; 111 return kCONTINUE; 112 } 113 pos += len; 114 } 88 115 89 116 return kTRUE; … … 94 121 // Interprete the Bit rates part of the report 95 122 // 96 Int_t MReportTrigger::InterpreteBit(TString &str)123 Bool_t MReportTrigger::InterpreteBit(TString &str) 97 124 { 98 125 … … 104 131 // Interprete the IPR part of the report 105 132 // 106 Int_t MReportTrigger::InterpreteIPR(TString &str)133 Bool_t MReportTrigger::InterpreteIPR(TString &str) 107 134 { 108 135 … … 114 141 // Interprete the Prescaling factors part of the report 115 142 // 116 Int_t MReportTrigger::InterpretePrescFact(TString &str)143 Bool_t MReportTrigger::InterpretePrescFact(TString &str) 117 144 { 118 145 … … 215 242 216 243 */ 217 str.Remove(0, pos-str.Data()); 244 245 Int_t len=1; 246 str.Remove(0,len); 218 247 str.Strip(TString::kBoth); 219 248 -
trunk/MagicSoft/Mars/mtemp/mpisa/classes/MReportTrigger.h
r4157 r4185 13 13 class MTriggerCell; 14 14 class MTriggerBit; 15 class MTriggerPrescFact; 16 class MTriggerLiveTime; 15 17 16 18 class MReportTrigger : public MReport … … 27 29 MTriggerCell *fCell; // container of the L1 cell trigger rates 28 30 MTriggerPrescFact *fPrescFactor; //container of the L2 prescaling factors 31 MTriggerLiveTime *fLiveTime; //container of the scaler live-deadtime 29 32 30 33 Bool_t SetupReading(MParList &plist); 31 Bool_t CheckVersion(TString &str) const;32 34 33 35 Bool_t InterpreteIPR(TString &str);
Note:
See TracChangeset
for help on using the changeset viewer.