Changeset 8787
- Timestamp:
- 12/13/07 14:19:38 (17 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 1 deleted
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r8786 r8787 37 37 * mtrigger/MTriggerPattern.[h,cc]: 38 38 - a new bit implemented for the sum-trigger 39 40 * datacenter/compmux: 41 - removed this BINARY. There is no way and it doesn't make any sense 42 (except in a few exceptional cases) to put binaries into the cvs 39 43 40 44 -
trunk/MagicSoft/Mars/NEWS
r8780 r8787 24 24 * Sequence files now allow for excluding runs from the analysis 25 25 (for more details see Class reference of MSequence) 26 * added code to process the sum-trigger flag 27 28 ;callisto 29 * in the pedestal processing now at least 50 processed events are 30 required for succeeding. 31 26 32 ;ganymed/sponde 27 33 * Now data points are even shown correctly if they have error bars larger 28 34 than one sigma. Points with null or negative significances are omitted. 35 29 36 ;sponde 30 37 *fixed resource files ('''Spectrum''' instead of '''MJSpectrum''') -
trunk/MagicSoft/Mars/callisto.rc
r8582 r8787 287 287 #MJPedestalY2.UseData: Yes 288 288 #MJPedestalY3.UseData: Yes 289 #MJPedestalY1.MinEvents: 50 290 #MJPedestalY2.MinEvents: 50 291 #MJPedestalY3.MinEvents: 50 289 292 MJPedestalY1.MaxEvents: 500 290 293 MJPedestalY2.MaxEvents: 5000 -
trunk/MagicSoft/Mars/callisto_Dec04Jan05.rc
r8582 r8787 316 316 #MJPedestalY2.UseData: Yes 317 317 #MJPedestalY3.UseData: Yes 318 #MJPedestalY1.MinEvents: 50 319 #MJPedestalY2.MinEvents: 50 320 #MJPedestalY3.MinEvents: 50 318 321 MJPedestalY1.MaxEvents: 500 319 322 MJPedestalY2.MaxEvents: 5000 -
trunk/MagicSoft/Mars/callisto_mux.rc
r8585 r8787 312 312 #MJPedestalY2.UseData: Yes 313 313 #MJPedestalY3.UseData: Yes 314 #MJPedestalY1.MinEvents: 50 315 #MJPedestalY2.MinEvents: 50 316 #MJPedestalY3.MinEvents: 50 314 317 MJPedestalY1.MaxEvents: 3500 315 318 MJPedestalY2.MaxEvents: 30000 -
trunk/MagicSoft/Mars/mhflux/MHAlpha.cc
r8780 r8787 121 121 fHTheta.SetDirectory(NULL); 122 122 fHTheta.UseCurrentStyle(); 123 fHTheta.SetMinimum(0); 123 124 124 125 // effective on time versus time … … 133 134 fHTime.GetXaxis()->SetTimeFormat("%H:%M:%S %F1995-01-01 00:00:00 GMT"); 134 135 fHTime.GetXaxis()->SetTimeDisplay(1); 136 fHTime.SetMinimum(0); 135 137 fHTime.Sumw2(); 136 138 -
trunk/MagicSoft/Mars/mjobs/MJPedestal.cc
r8582 r8787 19 19 ! Author(s): Markus Gaug, 4/2004 <mailto:markus@ifae.es> 20 20 ! 21 ! Copyright: MAGIC Software Development, 2000-200 521 ! Copyright: MAGIC Software Development, 2000-2007 22 22 ! 23 23 ! … … 29 29 // 30 30 // Resource file entries are case sensitive! 31 // 32 // We require at least fMinEvents (def=50) to be processed by the 33 // ExtractPedestal-task. If not an error is returned. 31 34 // 32 35 ///////////////////////////////////////////////////////////////////////////// … … 118 121 : fExtractor(NULL), fDisplayType(kDisplayDataCheck), 119 122 fExtractType(kUsePedRun), fExtractionType(kFundamental), 120 fIsUseHists(kFALSE), fDeadPixelCheck(kFALSE) 123 fIsUseHists(kFALSE), fDeadPixelCheck(kFALSE), fMinEvents(50) 121 124 { 122 125 fName = name ? name : "MJPedestal"; … … 761 764 SetExtractWinRight(GetEnv("ExtractWinRight", fExtractWinRight)); 762 765 766 SetMinEvents(GetEnv("MinEvents", (Int_t)fMinEvents)); 767 763 768 if (!MJCalib::CheckEnvLocal()) 764 769 return kFALSE; … … 1252 1257 } 1253 1258 1259 if (taskenv.GetNumExecutions()<fMinEvents) 1260 { 1261 *fLog << err << GetDescriptor() << ": Failed. Less than the required " << fMinEvents << " evts processed." << endl; 1262 return kFALSE; 1263 } 1264 1254 1265 if (fDeadPixelCheck) 1255 1266 { -
trunk/MagicSoft/Mars/mjobs/MJPedestal.h
r8518 r8787 51 51 Float_t fExtractWinLeft; // Number of FADC slices to extract leftward from mean pulse pos. 52 52 Float_t fExtractWinRight; // Number of FADC slices to extract rightward from mean pulse pos. 53 53 54 54 TString fReferenceFile; // File name containing the reference values 55 55 TString fBadPixelsFile; // File name containing the bad pixels excluded beforehand 56 56 57 57 MExtractor *fExtractor; // Signal extractor, used to find the nr. of used FADC slices 58 58 … … 73 73 Bool_t fIsUseHists; // Switch on histogramming or not 74 74 Bool_t fDeadPixelCheck; // Should the dead pixel check be done? 75 76 UInt_t fMinEvents; // Minimum number of events 75 77 76 78 MExtractor *ReadCalibration(); … … 93 95 94 96 Bool_t WriteExtractor() const; 95 97 96 98 public: 97 99 MJPedestal(const char *name=NULL, const char *title=NULL); … … 128 130 void SetExtractWinRight( const Float_t f=fgExtractWinRight ) { fExtractWinRight = f; } 129 131 132 void SetMinEvents(UInt_t min) { fMinEvents = min; } 133 130 134 MExtractor *GetExtractor() const { return fExtractor; } 131 135 -
trunk/MagicSoft/Mars/mtrigger/MFTriggerPattern.cc
r7170 r8787 19 19 ! Author(s): Thomas Bretz 12/2004 <mailto:tbretz@astro.uni-wuerzburg.de> 20 20 ! 21 ! Copyright: MAGIC Software Development, 2004 21 ! Copyright: MAGIC Software Development, 2004-2007 22 22 ! 23 23 \* ======================================================================== */ … … 135 135 } 136 136 137 void MFTriggerPattern::RequireSumTrigger(Prescale_t prescaled) 138 { 139 prescaled==kPrescaled ? (fMaskRequiredPrescaled |= MTriggerPattern::kSumTrigger) : (fMaskRequiredUnprescaled |= MTriggerPattern::kSumTrigger); 140 } 141 137 142 138 143 void MFTriggerPattern::DenyTriggerLvl1(Prescale_t prescaled) … … 159 164 { 160 165 prescaled==kPrescaled ? (fMaskDeniedPrescaled |= MTriggerPattern::kPinDiode) : (fMaskDeniedUnprescaled |= MTriggerPattern::kPinDiode); 166 } 167 168 void MFTriggerPattern::DenySumTrigger(Prescale_t prescaled) 169 { 170 prescaled==kPrescaled ? (fMaskDeniedPrescaled |= MTriggerPattern::kSumTrigger) : (fMaskDeniedUnprescaled |= MTriggerPattern::kSumTrigger); 161 171 } 162 172 … … 222 232 // "PED" : Pedestal flag 223 233 // "PIND" : Pin Diode flag 234 // "SUMT" : Sum Trigger flag 224 235 // 225 236 // concatenations of these strings are allowed and considered as … … 246 257 if (patt.Contains("PIND", TString::kIgnoreCase)) 247 258 RequirePinDiode(prescaled); 259 260 if (patt.Contains("SUMT", TString::kIgnoreCase)) 261 RequireSumTrigger(prescaled); 248 262 } 249 263 … … 261 275 // "PED" : Pedestal flag 262 276 // "PIND" : Pin Diode flag 277 // "SUMT" : Sum Trigger flag 263 278 // 264 279 // concatenations of these strings are allowed and considered as … … 285 300 if (patt.Contains("PIND", TString::kIgnoreCase)) 286 301 DenyPinDiode(prescaled); 302 303 if (patt.Contains("SUMT", TString::kIgnoreCase)) 304 DenySumTrigger(prescaled); 287 305 } 288 306 -
trunk/MagicSoft/Mars/mtrigger/MFTriggerPattern.h
r6968 r8787 18 18 private: 19 19 MTriggerPattern *fPattern; //! 20 20 21 21 Byte_t fMaskRequiredPrescaled; // Mask for filtering Trigger Pattern allowed 22 22 Byte_t fMaskRequiredUnprescaled; // Mask for filtering Trigger Pattern allowed … … 26 26 Bool_t fDefault; // Default which is used if trigger pattern has default value (p==0&&u==0) 27 27 Bool_t fResult; //! 28 28 29 29 Int_t PreProcess(MParList *pList); 30 30 Int_t Process(); 31 31 32 32 Bool_t IsExpressionTrue() const; 33 33 34 34 public: 35 35 MFTriggerPattern(const char *name=NULL, const char *title=NULL); 36 36 MFTriggerPattern(MFTriggerPattern &trigpatt); 37 37 38 38 void RequireTriggerLvl1(Prescale_t prescaled=kUnPrescaled); 39 39 void RequireTriggerLvl2(Prescale_t prescaled=kUnPrescaled); … … 41 41 void RequirePedestal(Prescale_t prescaled=kUnPrescaled); 42 42 void RequirePinDiode(Prescale_t prescaled=kUnPrescaled); 43 43 void RequireSumTrigger(Prescale_t prescaled=kUnPrescaled); 44 44 45 void DenyTriggerLvl1(Prescale_t prescaled=kUnPrescaled); 45 46 void DenyTriggerLvl2(Prescale_t prescaled=kUnPrescaled); … … 47 48 void DenyPedestal(Prescale_t prescaled=kUnPrescaled); 48 49 void DenyPinDiode(Prescale_t prescaled=kUnPrescaled); 49 50 void DenySumTrigger(Prescale_t prescaled=kUnPrescaled); 51 50 52 void Require(TString patt, Prescale_t prescaled=kUnPrescaled); 51 53 void Deny(TString patt, Prescale_t prescaled=kUnPrescaled); … … 56 58 void SetMaskRequired(const Byte_t mask, Prescale_t prescaled=kUnPrescaled); 57 59 void SetMaskDenied(const Byte_t mask, Prescale_t prescaled=kUnPrescaled); 58 60 59 61 ClassDef(MFTriggerPattern, 1) // A Filter for the Trigger Pattern 60 62 }; 61 63 62 64 #endif -
trunk/MagicSoft/Mars/mtrigger/MTriggerPattern.cc
r7170 r8787 19 19 ! Author(s): Thomas Bretz 12/2004 <mailto:nicola.galante@pi.infn.it> 20 20 ! 21 ! Copyright: MAGIC Software Development, 2004 21 ! Copyright: MAGIC Software Development, 2004-2007 22 22 ! 23 23 \* ======================================================================== */ … … 67 67 // BIT(3): prescaled Pedestal Trigger 68 68 // BIT(4): prescaled Pin Diode 69 // BIT(5): unused69 // BIT(5): prescaled Sum Trigger 70 70 // BIT(6): unused 71 71 // BIT(7): unused … … 75 75 // BIT(11): unprescaled Pedestal Trigger 76 76 // BIT(12): unprescaled Pin Diode 77 // BIT(13): un used77 // BIT(13): unprescaled Sum Trigger 78 78 // BIT(14): unused 79 79 // BIT(15): unused -
trunk/MagicSoft/Mars/mtrigger/MTriggerPattern.h
r5867 r8787 16 16 kTriggerLvl2 = BIT(2), // LUT Pseudo Size selection 17 17 kPedestal = BIT(3), 18 kPinDiode = BIT(4) 19 //kUnused = BIT(5)18 kPinDiode = BIT(4), 19 kSumTrigger = BIT(5) // Flag for an event taken with sum trigger 20 20 //kUnused = BIT(6) 21 21 //kUnused = BIT(7)
Note:
See TracChangeset
for help on using the changeset viewer.