Changeset 5515
- Timestamp:
- 11/30/04 13:48:00 (20 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r5512 r5515 26 26 - InitArrays: added missing return statement 27 27 28 29 30 28 2004/11/30: Markus Gaug 31 29 … … 39 37 - updated to new version of MPedCalcPedRun (only important for 40 38 intensity calibration) 41 39 40 * msignal/MExtractTimeAndCharge.cc 41 - fixed bug for very high saturating signals setting the low-gain 42 range wrong. 43 44 * mcalib/MCalibrationChargeCalc.[h,cc] 45 - added variable containing the name of the requested MPedestalCam 42 46 43 47 -
trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc
r5413 r5515 1 2 1 /* ======================================================================== *\ 3 2 ! … … 239 238 const Float_t MCalibrationChargeCalc::fgPheErrLimit = 4.5; 240 239 const Float_t MCalibrationChargeCalc::fgFFactorErrLimit = 4.5; 240 const TString MCalibrationChargeCalc::fgNamePedestalCam = "MPedestalCam"; 241 241 // -------------------------------------------------------------------------- 242 242 // … … 258 258 // - fLambdaCheckLimit to fgLambdaCheckLimit 259 259 // - fLambdaErrLimit to fgLambdaErrLimit 260 // - fNamePedestalCam to fgNamePedestalCam 260 261 // - fPheErrLimit to fgPheErrLimit 261 262 // - fPulserColor to MCalibrationCam::kCT1 … … 287 288 SetLambdaCheckLimit (); 288 289 SetLambdaErrLimit (); 290 SetNamePedestalCam (); 289 291 SetPheErrLimit (); 290 292 SetOutputPath (); … … 363 365 // Containers that have to be there. 364 366 // 365 fPedestals = (MPedestalCam*)pList->FindObject("MPedestalCam" );367 fPedestals = (MPedestalCam*)pList->FindObject("MPedestalCam", AddSerialNumber(fNamePedestalCam.Data())); 366 368 if (!fPedestals) 367 369 { 368 *fLog << err << "MPedestalCamnot found... aborting" << endl;370 *fLog << err << fNamePedestalCam.Data() << " not found... aborting" << endl; 369 371 return kFALSE; 370 372 } -
trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.h
r5133 r5515 58 58 static const Float_t fgFFactorErrLimit; //! Default for fFFactorErrLimit (now set to: 4.5) 59 59 60 static const TString fgNamePedestalCam; //! "MPedestalCam" 61 60 62 // Variables 61 63 Float_t fChargeLimit; // Limit acceptance mean charge (in units of PedRMS) … … 83 85 TString fOutputPath; // Path to the output file 84 86 TString fOutputFile; // Name of the output file 87 TString fNamePedestalCam; // Name of the 'MPedestalCam' container 85 88 86 89 // Pointers … … 116 119 117 120 // functions 118 const char* GetOutputFile();119 121 void FinalizePedestals ( const MPedestalPix &ped, MCalibrationChargePix &cal, const Int_t aidx ); 120 122 Bool_t FinalizeCharges ( MCalibrationChargePix &cal, MBadPixelsPix &bad, const char* what); … … 129 131 void FinalizeUnsuitablePixels(); 130 132 131 void PrintUncalibrated( MBadPixelsPix::UncalibratedType_t typ, const char *text) const;133 const char* GetOutputFile(); 132 134 133 135 // Query checks … … 138 140 Bool_t IsCheckOscillations () const { return TESTBIT(fCheckFlags,kCheckOscillations); } 139 141 142 void PrintUncalibrated( MBadPixelsPix::UncalibratedType_t typ, const char *text) const; 143 140 144 // Global fit results 141 145 void SetPheFitOK ( const Int_t aidx, const Bool_t b=kTRUE ) { … … 197 201 void SetLambdaErrLimit ( const Float_t f=fgLambdaErrLimit ) { fLambdaErrLimit = f; } 198 202 void SetLambdaCheckLimit ( const Float_t f=fgLambdaCheckLimit ) { fLambdaCheckLimit = f; } 203 void SetNamePedestalCam ( const char *name=fgNamePedestalCam.Data()) { fNamePedestalCam = name; } 199 204 void SetOutputPath ( TString path="." ); 200 205 void SetOutputFile ( TString file="ChargeCalibStat.txt" );
Note:
See TracChangeset
for help on using the changeset viewer.