Index: /trunk/MagicSoft/Mars/Changelog =================================================================== --- /trunk/MagicSoft/Mars/Changelog (revision 8451) +++ /trunk/MagicSoft/Mars/Changelog (revision 8452) @@ -19,4 +19,80 @@ -*-*- END OF LINE -*-*- + 2007/04/27 Thomas Bretz + + * mcalib/CalibLinkDef.h, mcalib/Makefile: + - removed obsolete MCalibrationIntensityCam + - removed obsolete MCalibrationIntensityChargeCam + + * mcalib/MCalibCalcFromPast.[h,cc], mcalib/MCalibColorSteer.[h,cc], + mcalib/MCalibrateData.[h,cc], mhcalib/MHCalibrationChargeCam.[h,cc]: + - removed obsolete MCalibrationIntensityChargeCam and replaced by + MCalibrationChargeCam + + * mcalib/MCalibrationChargeCalc.[h,cc]: + - removed obsolete MCalibrationIntensityChargeCam and replaced by + MCalibrationChargeCam + - to realize the difference between continous and single calibration + a new data member fContinousCalibration has been introduced + - consequently increased version number to 6 + - do not set any exclusion in ReInit. it is nonsense not to fill + histograms which might give (or give not) correct result, + if the checks are all executed anyhow + + * mcalib/MCalibrationRelTimeCalc.cc: + - do not set any exclusion in ReInit and if a pixel is unsuitable. + it is nonsense not to fill histograms which might give (or give + not) correct result, if the checks are all executed anyhow + - switched on the check for outliers + - outliers are now set unsuitable rather than unreliable + - some code simplification of the checks + + * mcalib/MCalibrationChargeCam.cc: + - added a comment in the Clear member function + + * mcalib/MCalibrationRelTimeCam.cc: + - some fixes of looong Form statements + - a small cosmetic change to GetPixelContent + - replaced the old check of the average time resolution by + a more accurate check using the median and deviation + + * mhcalib/MHCalibrationRelTimeCam.[h,cc]: + - removed data member fReferencePixel and corresponding code + - use the median of pixels with area index 0 as reference instead of + an artificial pixel + + * mhcalib/MHCalibrationCam.[h,cc]: + - finally removed all dependencies on the intensity cams and replaced + them by the direct cam + - if the lo-gain histogram is empty this is not a reason for an + uncalibrated pixel. At least in case of extracted properties (charge + and time) it is ok. + + * mjobs/MJCalibration.cc: + - let MCalibrationRelTimeCalc run after MCalibrationChargeCalc + otherwise almost all unsuitable pixels have deviating + relative arrival resolution. + - added new level for deviating time reolution to plot of bad pixels + - changed reference lines for timr resolution plots + - removed data member fRefTimeOffsetInner, it is now 0 by definition + + * mjobs/MJCalibrateSignal.cc: + - finally removed all dependencies of Intensity cams + - enable ContinousCalibration in MCalibrationChargeCalc instead + - switched on interleaved relative time calibration + + * mbadpixels/MBadPixelsPix.h: + - adapted to new unsuitable flag kDeviatingTimeResolution + + * callisto_mux.rc: + - removed the obsolete resource statement about the level + for the relative arrival time check. + + * mjobs/calibrationref.rc, mjobs/calibrationref_Dec04.rc, + mjobs/calibrationref_Nov04.rc, resources/calibrationref_mux.rc: + - changed time resolution references accordingly + + + 2007/04/26 Thomas Bretz Index: /trunk/MagicSoft/Mars/NEWS =================================================================== --- /trunk/MagicSoft/Mars/NEWS (revision 8451) +++ /trunk/MagicSoft/Mars/NEWS (revision 8452) @@ -56,4 +56,25 @@ helps to get rid of artefacts in histograms. For the signal this is not necessray because it is displayed in log-scale anyhow + + - callisto: Fixed a problem with internal exclusions. Pixels which + have once been marked as unsuitable didn't get the necessary + histograms filled anymore to be rechecked with each interleaved + calibration. + + - callisto: The relative arrival time resolution (the rms of the + relative arrival time offset) is now checked against its + median and the median deviation, instead of the average + plus an absolute offset. + + - callisto: The relative arrival time offset is now calculated + w.r.t. its median not w.r.t. to an artificial reference pixel. + + - callisto: The relative time calibration now marks pixels with + outlaying offset as unsuitable + + - callisto: The interleaved relative time calibration has been switched + on. The advantage is that pixels which are marked as outliers + now can recover. An improvement over time is not expected, because + the relative time calibration seems stable. - ganymed: If the dataset file containes "MonteCarlo: Yes" the "-mc" Index: /trunk/MagicSoft/Mars/callisto_mux.rc =================================================================== --- /trunk/MagicSoft/Mars/callisto_mux.rc (revision 8451) +++ /trunk/MagicSoft/Mars/callisto_mux.rc (revision 8452) @@ -282,6 +282,4 @@ #MJCalibration.MHCalibrationRelTimeCam.PulserFrequency: 500 -MJCalibration.MCalibrationRelTimeCalc.RelTimeResolutionLimit: 0.2 - # ========================================================================== ############################################################################# Index: /trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.h =================================================================== --- /trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.h (revision 8451) +++ /trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.h (revision 8452) @@ -107,7 +107,8 @@ if (IsUncalibrated( kFluctuatingArrivalTimes)) return 8; if (IsUncalibrated( kDeviatingNumPhes )) return 9; - if (IsUncalibrated( kLoGainBlackout )) return 10; - if (IsUncalibrated( kPreviouslyExcluded )) return 11; - return 12; + if (IsUncalibrated( kDeviatingTimeResolution)) return 10; + if (IsUncalibrated( kLoGainBlackout )) return 11; + if (IsUncalibrated( kPreviouslyExcluded )) return 12; + return 13; } @@ -115,5 +116,4 @@ if (!IsUnreliable() || IsUnsuitable()) return 0; if (IsUncalibrated( kChargeSigmaNotValid )) return 1; - if (IsUncalibrated( kDeviatingNumPhes )) return 2; if (IsUncalibrated( kHiGainNotFitted )) return 3; if (IsUncalibrated( kLoGainNotFitted )) return 4; Index: /trunk/MagicSoft/Mars/mcalib/CalibLinkDef.h =================================================================== --- /trunk/MagicSoft/Mars/mcalib/CalibLinkDef.h (revision 8451) +++ /trunk/MagicSoft/Mars/mcalib/CalibLinkDef.h (revision 8452) @@ -16,7 +16,4 @@ #pragma link C++ class MCalibConstCam+; #pragma link C++ class MCalibConstPix+; - -#pragma link C++ class MCalibrationIntensityCam+; -#pragma link C++ class MCalibrationIntensityChargeCam+; #pragma link C++ class MCalibrationCam+; Index: /trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.cc =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.cc (revision 8451) +++ /trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.cc (revision 8452) @@ -30,8 +30,6 @@ // Input Containers: // MParList -// MCalibrationIntensityChargeCam // // Output Containers: -// MCalibrationIntensityChargeCam // // Class version 2: @@ -55,10 +53,9 @@ #include "MHCalibrationCam.h" -#include "MCalibrationIntensityChargeCam.h" - #include "MBadPixelsCam.h" #include "MCalibrationQECam.h" #include "MCalibrationBlindCam.h" +#include "MCalibrationChargeCam.h" #include "MCalibrationChargePix.h" #include "MCalibrationChargeCalc.h" @@ -83,5 +80,5 @@ MCalibCalcFromPast::MCalibCalcFromPast(const char *name, const char *title) : fGeom(NULL), fParList(NULL), fRunHeader(NULL), - fIntensCharge(NULL), fBlindCam(NULL), fQECam(NULL), fBadPixels(NULL), + fCharge(NULL), fBlindCam(NULL), fQECam(NULL), fBadPixels(NULL), fChargeCalc(NULL), fRelTimeCalc(NULL), fCalibrate(NULL), fNumCam(0), fNumEvents(0), fUpdateWithFFactorMethod(kTRUE), fUpdateNumPhes(kTRUE), @@ -133,5 +130,5 @@ // - // Look for the MBadPixels Intensity Cam + // Look for the MCalibrationQECam // fQECam = (MCalibrationQECam*)pList->FindObject("MCalibrationQECam"); @@ -143,6 +140,5 @@ // - // Look for the MFillH-class "MHCalibrationBlindCam". In case yes, initialize the - // corresponding IntensityCam + // Look for the MFillH-class "MHCalibrationBlindCam". // if (pList->FindObject(AddSerialNumber("MHCalibrationBlindCam"))) @@ -156,20 +152,12 @@ // - // Look for the MFillH-class "MHCalibrationChargeCam". In case yes, initialize the - // corresponding IntensityCam + // Look for the MFillH-class "MHCalibrationChargeCam". // if (pList->FindObject(AddSerialNumber("MHCalibrationChargeCam"))) { - fIntensCharge = (MCalibrationIntensityChargeCam*)pList->FindCreateObj("MCalibrationIntensityChargeCam"); - if (!fIntensCharge) - return kFALSE; - - MCalibrationChargeCam *chargeinit = (MCalibrationChargeCam*)pList->FindObject("MCalibrationChargeCam"); - - if (chargeinit) - fIntensCharge->SetCam(chargeinit,0); - else - *fLog << "Could not find initial MCalibrationChargeCam, cannot initialize intensity cam" << endl; + fCharge = (MCalibrationChargeCam*)pList->FindCreateObj("MCalibrationChargeCam"); + if (!fCharge) + return kFALSE; if (!fChargeCalc) @@ -194,12 +182,8 @@ // - // Look for the MFillH name "FillRelTimeCam". In case yes, initialize the - // corresponding IntensityCam + // Look for the MFillH name "FillRelTimeCam". // if (pList->FindObject(AddSerialNumber("MHCalibrationRelTimeCam"))) { - // if (!pList->FindCreateObj("MCalibrationIntensityRelTimeCam")) - // return kFALSE; - if (!fRelTimeCalc) fRelTimeCalc = (MCalibrationRelTimeCalc*)pList->FindObject(AddSerialNumber("MCalibrationRelTimeCalc")); @@ -252,8 +236,8 @@ // // - Initializes new containers in the -// - Intensity Cams, if the number of calibration events has reach fNumEventsDump. +// - if the number of calibration events has reach fNumEventsDump. // - Executes Finalize() of the MCalibration*Calc classes in that case. // - Sets the latest MCalibrationChargeCam as update class into MCalibrateData -// - Initialize new MCalibration*Cams into the intensity cams. +// - clean MCalibration*Cams // Int_t MCalibCalcFromPast::Process() @@ -263,5 +247,5 @@ // Replace the old cams by (empty) new ones - // MCalibrationChargeCam: fIntensCharge + // MCalibrationChargeCam: fCharge // MCalibrationQECam: fIntensQE // MCalibrationBlindCam: fIntensBlind @@ -276,5 +260,5 @@ *fLog << inf << "Finalize calibration histograms:" << endl; - // This fills the IntensityCam which are newly created by + // This fills the Cams which are cleared by // ReInitialize with the result of the last calib cycle Finalize("MHCalibrationChargeCam"); @@ -299,5 +283,5 @@ if (fUpdateNumPhes) { - MCalibrationChargePix &avpix =(MCalibrationChargePix&)fIntensCharge->GetCam()->GetAverageArea(0); + MCalibrationChargePix &avpix =(MCalibrationChargePix&)fCharge->GetAverageArea(0); fPhes [fNumPhes] = avpix.GetPheFFactorMethod(); fPhesVar[fNumPhes] = avpix.GetPheFFactorMethodVar(); @@ -329,6 +313,5 @@ if (fCalibrate) - return fCalibrate->UpdateConversionFactors(fUpdateWithFFactorMethod ? NULL - : (MCalibrationChargeCam*)fIntensCharge->GetCam() ); + return fCalibrate->UpdateConversionFactors(fUpdateWithFFactorMethod ? NULL : fCharge); return kTRUE; @@ -358,7 +341,5 @@ // -------------------------------------------------------------------------- // -// Re-Intitializes new containers inside the Intensity Cams. -// From now on, a call to the IntensityCam functions returns pointers -// to the newly created Containers. +// Clear contents of cams // Bool_t MCalibCalcFromPast::ReInitialize() @@ -391,19 +372,9 @@ // IF SIMPLE ENOUGH, REMOVE THE FUNCTION! - if (fIntensCharge) - { - *fLog << "MCalibrationChargeCam..."; - MCalibrationChargeCam *cold = (MCalibrationChargeCam*)fIntensCharge->GetCam(); - - fIntensCharge->AddToList(Form("MCalibrationChargeCam%04d",fNumCam),*fGeom); - - MCalibrationChargeCam *cnew = (MCalibrationChargeCam*)fIntensCharge->GetCam(); - cnew->SetRunNumber(runnumber); - - if (cold) - { - cnew->MergeHiLoConversionFactors(*cold); - fIntensCharge->DeleteOldCam(cold); - } + if (fCharge) + { + *fLog << "MCalibrationChargeCam..."; + fCharge->Clear(); + fCharge->SetRunNumber(runnumber); } Index: /trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.h =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.h (revision 8451) +++ /trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.h (revision 8452) @@ -17,5 +17,5 @@ class MCalibrationRelTimeCalc; class MCalibrateData; -class MCalibrationIntensityChargeCam; +class MCalibrationChargeCam; class MCalibrationBlindCam; class MCalibrationQECam; @@ -32,5 +32,5 @@ MParList *fParList; //! Parameter List MRawRunHeader *fRunHeader; //! Run header storing the run number - MCalibrationIntensityChargeCam *fIntensCharge; //! Intensity Charge Cam (to be created) + MCalibrationChargeCam *fCharge; //! Intensity Charge Cam (to be created) MCalibrationBlindCam *fBlindCam; //! Blind Cam Index: /trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.cc =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.cc (revision 8451) +++ /trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.cc (revision 8452) @@ -33,8 +33,6 @@ // MCalibrationPattern // MParList -// MCalibrationIntensityChargeCam // // Output Containers: -// MCalibrationIntensityChargeCam // ////////////////////////////////////////////////////////////////////////////// @@ -55,6 +53,4 @@ #include "MBadPixelsCam.h" -#include "MCalibrationIntensityChargeCam.h" - #include "MCalibrationPattern.h" #include "MCalibrationQECam.h" @@ -76,6 +72,5 @@ // MCalibColorSteer::MCalibColorSteer(const char *name, const char *title) - : fCalibPattern(NULL), fGeom(NULL), fParList(NULL), - fIntensCharge(NULL), + : fCalibPattern(NULL), fGeom(NULL), fParList(NULL), fCharge(NULL), fBad(NULL), fChargeCalc(NULL), fRelTimeCalc(NULL), fHistCopy(kFALSE) { @@ -148,6 +143,5 @@ // - // Look for the MFillH name "FillChargeCam". In case yes, initialize the - // corresponding IntensityCam + // Look for the MFillH name "FillChargeCam". // if (pList->FindObject(AddSerialNumber("MHCalibrationChargeCam"))) @@ -155,6 +149,6 @@ *fLog << inf << "Found MHCalibrationChargeCam ... " << flush; - fIntensCharge = (MCalibrationIntensityChargeCam*)pList->FindCreateObj("MCalibrationIntensityChargeCam"); - if (!fIntensCharge) + fCharge = (MCalibrationChargeCam*)pList->FindCreateObj("MCalibrationChargeCam"); + if (!fCharge) return kFALSE; @@ -172,6 +166,5 @@ // - // Look for the MFillH name "FillRelTimeCam". In case yes, initialize the - // corresponding IntensityCam + // Look for the MFillH name "FillRelTimeCam". // if (pList->FindObject(AddSerialNumber("MHCalibrationRelTimeCam"))) @@ -199,6 +192,6 @@ // -------------------------------------------------------------------------- // -// Reads the pattern from MCalibrationPattern and initializes new containers in the -// Intensity Cams, if the pattern has changed. Executes Finalize of the +// Reads the pattern from MCalibrationPattern and clear +// Cams, if the pattern has changed. Executes Finalize of the // MCalibration*Calc classes in that case. // @@ -256,6 +249,6 @@ // -------------------------------------------------------------------------- // -// Reads the pattern from MCalibrationPattern and initializes new containers in the -// Intensity Cams, if the pattern has changed. Executes Finalize of the +// Reads the pattern from MCalibrationPattern and clear +// Cams, if the pattern has changed. Executes Finalize of the // MCalibration*Calc classes in that case. // @@ -290,5 +283,5 @@ hist->Finalize(); - CopyHist(name); + //CopyHist(name); hist->ResetHists(); hist->SetColor( fCalibPattern->GetPulserColor()); @@ -298,7 +291,5 @@ // -------------------------------------------------------------------------- // -// Re-Intitializes new containers inside the Intensity Cams. -// From now on, a call to the IntensityCam functions returns pointers -// to the newly created Containers. +// Clear cams // Bool_t MCalibColorSteer::ReInitialize() @@ -310,22 +301,22 @@ fBad->Clear(); // FIXME:::::: MERGE PreExcl!!!! - fQECam->Clear(); + + if (fQECam) + fQECam->Clear(); fBlindCam->Clear(); fBlindCam->SetPulserColor(fCalibPattern->GetPulserColor()); - fRelTimeCam->Clear(); - fRelTimeCam->SetPulserColor(fCalibPattern->GetPulserColor()); - - if (fIntensCharge) - { - MCalibrationChargeCam *oldcam = (MCalibrationChargeCam*)fIntensCharge->GetCam(); - fIntensCharge->AddToList(Form("MCalibrationChargeCam%s",namep.Data()),*fGeom); - MCalibrationChargeCam *cam = (MCalibrationChargeCam*)fIntensCharge->GetCam(); - cam->SetPulserColor(fCalibPattern->GetPulserColor()); - if (!cam->MergeHiLoConversionFactors(*oldcam)) - return kFALSE; - *fLog << inf << "New MCalibrationChargeCam with name: " << cam->GetName() << endl; - } + if (fRelTimeCam) + { + fRelTimeCam->Clear(); + fRelTimeCam->SetPulserColor(fCalibPattern->GetPulserColor()); + } + + if (fCharge) + { + fCharge->Clear(); + fCharge->SetPulserColor(fCalibPattern->GetPulserColor()); + } return kTRUE; @@ -360,26 +351,2 @@ return result; } - -// -------------------------------------------------------------------------- -// -// Copies the histogram classes into the intensity cams -// -void MCalibColorSteer::CopyHist(const char* name) -{ - MHCalibrationCam *hcam = (MHCalibrationCam*)fParList->FindObject(name); - TString n(name); - if (n.Contains("ChargeCam")) - { - if (fIntensCharge) - fIntensCharge->AddHist((MHCalibrationCam*)hcam->Clone()); - } -// if (n.Contains("Blind")) -// if (fIntensBlind) -// fIntensBlind->AddHist((MHCalibrationCam*)hcam->Clone()); - -// if (n.Contains("RelTime")) -// if (fIntensRelTime) -// fIntensRelTime->AddHist((MHCalibrationCam*)hcam->Clone()); -} - -// -------------------------------------------------------------------------- Index: /trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.h =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.h (revision 8451) +++ /trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.h (revision 8452) @@ -16,6 +16,6 @@ class MRawRunHeader; class MCalibrationChargeCalc; +class MCalibrationChargeCam; class MCalibrationRelTimeCalc; -class MCalibrationIntensityChargeCam; class MCalibrationRelTimeCam; class MCalibrationBlindCam; @@ -30,28 +30,28 @@ MGeomCam *fGeom; //! MParList *fParList; //! - MCalibrationIntensityChargeCam *fIntensCharge; //! + MCalibrationChargeCam *fCharge; //! MCalibrationRelTimeCam *fRelTimeCam; //! MCalibrationBlindCam *fBlindCam; //! MCalibrationQECam *fQECam; //! MBadPixelsCam *fBad; //! - + MCalibrationChargeCalc *fChargeCalc; //! MCalibrationRelTimeCalc *fRelTimeCalc; //! - + MCalibrationCam::PulserColor_t fColor; Float_t fStrength; Bool_t fHistCopy; // Decide whether MHCalibrationCams will get copied - + Int_t PreProcess(MParList *pList); Int_t Process(); Int_t PostProcess(); - + Bool_t ReInitialize(); Bool_t Finalize(const char* name); - void CopyHist(const char* name); + //void CopyHist(const char* name); TString GetNamePattern(); - + public: MCalibColorSteer(const char *name=NULL, const char *title=NULL); Index: /trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc (revision 8451) +++ /trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc (revision 8452) @@ -1,4 +1,4 @@ /* ======================================================================== *\ -! $Name: not supported by cvs2svn $:$Id: MCalibrateData.cc,v 1.67 2007-04-20 11:48:08 tbretz Exp $ +! $Name: not supported by cvs2svn $:$Id: MCalibrateData.cc,v 1.68 2007-04-27 10:04:46 tbretz Exp $ ! -------------------------------------------------------------------------- ! @@ -114,5 +114,4 @@ #include "MPedestalPix.h" -#include "MCalibrationIntensityChargeCam.h" #include "MCalibrationChargeCam.h" #include "MCalibrationChargePix.h" @@ -155,5 +154,5 @@ // MCalibrateData::MCalibrateData(CalibrationMode_t calmode,const char *name, const char *title) - : fGeomCam(NULL), fBadPixels(NULL), fCalibrations(NULL), fIntensCalib(NULL), + : fGeomCam(NULL), fBadPixels(NULL), fCalibrations(NULL), fQEs(NULL), fSignals(NULL), fCerPhotEvt(NULL), fCalibConstCam(NULL), fPedestalFlag(kNo), fSignalType(kPhot), fRenormFactor(1.), fScaleFactor(1.) @@ -238,8 +237,4 @@ if (fCalibrationMode>kNone) { - fIntensCalib = (MCalibrationIntensityChargeCam*)pList->FindObject(AddSerialNumber("MCalibrationIntensityChargeCam")); - if (fIntensCalib) - *fLog << inf << "Found MCalibrationIntensityChargeCam ... " << endl; - fCalibrations = (MCalibrationChargeCam*)pList->FindObject(AddSerialNumber("MCalibrationChargeCam")); if (!fCalibrations) @@ -465,7 +460,5 @@ if (fCalibrationMode > kNone) { - - const MCalibrationCam *chargecam = fIntensCalib ? fIntensCalib->GetCam() : fCalibrations; - if (chargecam->GetSize() != npixels) + if (fCalibrations->GetSize() != npixels) { *fLog << "Size mismatch between MGeomCam and MCalibrationChargeCam... abort!" << endl; @@ -478,6 +471,6 @@ return kFALSE; } - } - + } + fCalibConsts .Set(npixels); fCalibFFactors.Set(npixels); @@ -512,10 +505,4 @@ fHiLoConv.Reset(); fHiLoConvErr.Reset(); - - MCalibrationChargeCam *chargecam = NULL; - if (updatecam) - chargecam = fCalibrations; - else - chargecam = fIntensCalib ? (MCalibrationChargeCam*)fIntensCalib->GetCam() : fCalibrations; // @@ -546,14 +533,14 @@ } - const MCalibrationChargePix &pix = (MCalibrationChargePix&)(*chargecam)[pixidx]; - const MCalibrationChargePix &avpix = (MCalibrationChargePix&)chargecam->GetAverageArea(0); + const MCalibrationChargePix &pix = (MCalibrationChargePix&)(*fCalibrations)[pixidx]; + const MCalibrationChargePix &avpix = (MCalibrationChargePix&)fCalibrations->GetAverageArea(0); hiloconv = pix.GetConversionHiLo (); hiloconverr= pix.GetConversionHiLoSigma(); - + calibConv = pix.GetMeanConvFADC2Phe(); calibConvVar = pix.GetMeanConvFADC2PheVar(); calibFFactor = pix.GetMeanFFactorFADC2Phot(); - + const MCalibrationQEPix &qe = (MCalibrationQEPix&)(*fQEs)[pixidx]; Index: /trunk/MagicSoft/Mars/mcalib/MCalibrateData.h =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibrateData.h (revision 8451) +++ /trunk/MagicSoft/Mars/mcalib/MCalibrateData.h (revision 8452) @@ -20,6 +20,4 @@ class MCalibrationChargeCam; class MCalibrationQECam; - -class MCalibrationIntensityChargeCam; class MCalibrateData : public MTask @@ -63,5 +61,4 @@ MBadPixelsCam *fBadPixels; //! Bad Pixels information MCalibrationChargeCam *fCalibrations; //! Calibration constants - MCalibrationIntensityChargeCam *fIntensCalib; //! Calibration constants from interlaced calib. MCalibrationQECam *fQEs; //! Quantum efficiencies MExtractedSignalCam *fSignals; //! Integrated charge in FADCs counts Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc (revision 8451) +++ /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc (revision 8452) @@ -1,4 +1,4 @@ /* ======================================================================== *\ -! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCalc.cc,v 1.176 2007-04-20 13:21:11 tbretz Exp $ +! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCalc.cc,v 1.177 2007-04-27 10:04:46 tbretz Exp $ ! -------------------------------------------------------------------------- ! @@ -200,4 +200,7 @@ // - TString fOutputFile // +// ClassVersion 6: +// - Bool_t fContinousCalibration +// ////////////////////////////////////////////////////////////////////////////// #include "MCalibrationChargeCalc.h" @@ -220,6 +223,4 @@ #include "MPedestalCam.h" #include "MPedestalPix.h" - -#include "MCalibrationIntensityChargeCam.h" #include "MHCalibrationChargeCam.h" @@ -362,5 +363,4 @@ fBadPixels = NULL; - fIntensCam = NULL; fCam = NULL; fHCam = NULL; @@ -440,5 +440,5 @@ // Search for the following input containers and abort if not existing: // - MGeomCam -// - MCalibrationIntensityChargeCam or MCalibrationChargeCam +// - MCalibrationChargeCam // - MCalibrationQECam // - MBadPixelsCam @@ -455,5 +455,4 @@ // It defines the PixId of every pixel in: // -// - MCalibrationIntensityChargeCam // - MCalibrationChargeCam // - MCalibrationQECam @@ -495,20 +494,14 @@ // - // Intensity containers + // MCalibrationChargeCam // - fIntensCam = (MCalibrationIntensityChargeCam*)pList->FindObject(AddSerialNumber("MCalibrationIntensityChargeCam")); - if (fIntensCam) - *fLog << inf << "Found MCalibrationIntensityChargeCam... " << flush; - else - { - fCam = (MCalibrationChargeCam*)pList->FindObject(AddSerialNumber("MCalibrationChargeCam")); - if (!fCam) - { - *fLog << err << "Cannot find MCalibrationChargeCam ... abort." << endl; - *fLog << "Maybe you forget to call an MFillH for the MHCalibrationChargeCam before..." << endl; - return kFALSE; - } - } - + fCam = (MCalibrationChargeCam*)pList->FindObject(AddSerialNumber("MCalibrationChargeCam")); + if (!fCam) + { + *fLog << err << "Cannot find MCalibrationChargeCam ... abort." << endl; + *fLog << "Maybe you forget to call an MFillH for the MHCalibrationChargeCam before..." << endl; + return kFALSE; + } + // // Blind pixel calibration @@ -550,25 +543,10 @@ // Further initialization // - MCalibrationChargeCam *chargecam = fIntensCam - ? (MCalibrationChargeCam*)fIntensCam->GetCam() : fCam; - - const UInt_t npixels = fGeom->GetNumPixels(); - - for (UInt_t i=0; iGetNumPixels(); + for (UInt_t i=0; iGetNumAreas()); @@ -606,30 +584,27 @@ // Now retrieve the colour and check if not various colours have been used // - if (!fIntensCam) - { - if (fPulserColor != MCalibrationCam::kNONE) - { - *fLog << warn << "Multiple colours used simultaneously!" << flush; - fHCam->Finalize(); - if (fHBlindCam) - fHBlindCam->Finalize(); - - Finalize(); - - fHCam->ResetHists(); - if (fHBlindCam) - fHBlindCam->ResetHists(); - - *fLog << inf << "Starting next calibration... " << flush; - - fHCam->SetColor(col); - if (fHBlindCam) - fHBlindCam->SetColor(col); - - fCam->SetPulserColor(col); - if (fBlindCam) - fBlindCam->SetPulserColor(col); - } - } + if (!fContinousCalibration && fPulserColor != MCalibrationCam::kNONE) + { + *fLog << warn << "Multiple colours used simultaneously!" << flush; + fHCam->Finalize(); + if (fHBlindCam) + fHBlindCam->Finalize(); + + Finalize(); + + fHCam->ResetHists(); + if (fHBlindCam) + fHBlindCam->ResetHists(); + + *fLog << inf << "Starting next calibration... " << flush; + + fHCam->SetColor(col); + if (fHBlindCam) + fHBlindCam->SetColor(col); + + fCam->SetPulserColor(col); + if (fBlindCam) + fBlindCam->SetPulserColor(col); + } // @@ -655,15 +630,11 @@ // Distribute new color to all containers // + fCam->SetPulserColor(col); + if (fBlindCam) + fBlindCam->SetPulserColor(col); + fHCam->SetColor(col); if (fHBlindCam) fHBlindCam->SetColor(col); - - MCalibrationChargeCam *chargecam = fIntensCam - ? (MCalibrationChargeCam*)fIntensCam->GetCam() : fCam; - - chargecam->SetPulserColor(col); - - if (fBlindCam) - fBlindCam->SetPulserColor(col); if (fPINDiode) fPINDiode->SetColor(col); @@ -724,6 +695,6 @@ // Call FinalizeUnsuitablePixels() // -// Call MParContainer::SetReadyToSave() for fIntensCam, fCam, fQECam, fBadPixels and -// fBlindCam and fPINDiode if they exist +// Call MParContainer::SetReadyToSave() for fCam, fQECam, fBadPixels and +// fBlindCam and fPINDiode if they exist // // Print out some statistics @@ -749,6 +720,4 @@ } - MCalibrationChargeCam *chargecam = fIntensCam ? (MCalibrationChargeCam*)fIntensCam->GetCam() : fCam; - // // First loop over pixels, call FinalizePedestals and FinalizeCharges @@ -759,5 +728,5 @@ { - MCalibrationChargePix &pix = (MCalibrationChargePix&)(*chargecam)[pixid]; + MCalibrationChargePix &pix = (MCalibrationChargePix&)(*fCam)[pixid]; // // Check if the pixel has been excluded from the fits @@ -786,5 +755,5 @@ if (nvalid == 0) { - if (!fIntensCam) + if (!fContinousCalibration) { *fLog << warn << GetDescriptor() << ": All pixels have non-valid calibration. " @@ -801,5 +770,5 @@ const MPedestalPix &ped = fPedestals->GetAverageArea(aidx); - MCalibrationChargePix &pix = (MCalibrationChargePix&)chargecam->GetAverageArea(aidx); + MCalibrationChargePix &pix = (MCalibrationChargePix&)fCam->GetAverageArea(aidx); const MArrayI &arr = fHCam->GetAverageAreaNum(); @@ -814,6 +783,6 @@ pix.SetSigma (pix.GetSigma()/pix.GetFFactorFADC2Phe()); - FinalizeCharges(pix, chargecam->GetAverageBadArea(aidx),"area id"); - FinalizeArrivalTimes(pix, chargecam->GetAverageBadArea(aidx), "area id"); + FinalizeCharges(pix, fCam->GetAverageBadArea(aidx),"area id"); + FinalizeArrivalTimes(pix, fCam->GetAverageBadArea(aidx), "area id"); } @@ -825,5 +794,5 @@ const MPedestalPix &ped = fPedestals->GetAverageSector(sector); - MCalibrationChargePix &pix = (MCalibrationChargePix&)chargecam->GetAverageSector(sector); + MCalibrationChargePix &pix = (MCalibrationChargePix&)fCam->GetAverageSector(sector); FinalizePedestals(ped,pix, 0); } @@ -840,11 +809,11 @@ // if (FinalizeFFactorMethod()) - chargecam->SetFFactorMethodValid(kTRUE); + fCam->SetFFactorMethodValid(kTRUE); else { *fLog << warn << "Could not calculate the photons flux from the F-Factor method " << endl; - chargecam->SetFFactorMethodValid(kFALSE); - if (!fIntensCam) - return kFALSE; + fCam->SetFFactorMethodValid(kFALSE); + if (!fContinousCalibration) + return kFALSE; } @@ -916,6 +885,6 @@ "Deviating F-Factor: "); - chargecam->SetReadyToSave(); - fQECam ->SetReadyToSave(); + fCam->SetReadyToSave(); + fQECam->SetReadyToSave(); fBadPixels->SetReadyToSave(); @@ -1109,5 +1078,5 @@ if (!cal.CalcConvFFactor()) { - *fLog << warn << desc << "Could not calculate the Conv. FADC counts to Phes" << endl; + *fLog << warn << desc << "Could not calculate the conv. FADC cts to phes" << endl; bad.SetUncalibrated(MBadPixelsPix::kDeviatingNumPhes); return kFALSE; @@ -1149,6 +1118,4 @@ // - MBadPixelsPix::kLoGainOverFlow // -// - Call MCalibrationPix::SetExcluded() for the bad pixels -// // Sets pixel to MBadPixelsPix::kUnreliableRun, if one of the following flags is set: // - MBadPixelsPix::kChargeSigmaNotValid @@ -1176,5 +1143,5 @@ bad.SetUnsuitable( MBadPixelsPix::kUnsuitableRun ); } - + if (IsCheckDeviatingBehavior()) { @@ -1182,14 +1149,14 @@ bad.SetUnsuitable( MBadPixelsPix::kUnsuitableRun ); } - + if (IsCheckHistOverflow()) { if (bad.IsUncalibrated( MBadPixelsPix::kHiGainOverFlow )) bad.SetUnsuitable( MBadPixelsPix::kUnsuitableRun ); - + if (bad.IsUncalibrated( MBadPixelsPix::kLoGainOverFlow )) bad.SetUnsuitable( MBadPixelsPix::kUnsuitableRun ); } - + if (IsCheckArrivalTimes()) { @@ -1235,7 +1202,4 @@ Bool_t MCalibrationChargeCalc::FinalizeFFactorMethod() { - MCalibrationChargeCam *chargecam = fIntensCam - ? (MCalibrationChargeCam*)fIntensCam->GetCam() : fCam; - const Int_t npixels = fGeom->GetNumPixels(); const Int_t nareas = fGeom->GetNumAreas(); @@ -1260,5 +1224,5 @@ for (Int_t i=0; iGetAverageArea(aidx); + MCalibrationChargePix &apix = (MCalibrationChargePix&)fCam->GetAverageArea(aidx); if (numareavalid[aidx] == 1) @@ -1495,5 +1459,5 @@ } - MCalibrationChargePix &spix = (MCalibrationChargePix&)chargecam->GetAverageSector(sector); + MCalibrationChargePix &spix = (MCalibrationChargePix&)fCam->GetAverageSector(sector); if (sectorweights[sector] < 0. || sectorphes[sector] <= 0.) @@ -1524,5 +1488,5 @@ { - MCalibrationChargePix &pix = (MCalibrationChargePix&)(*chargecam)[i]; + MCalibrationChargePix &pix = (MCalibrationChargePix&)(*fCam)[i]; MBadPixelsPix &bad = (*fBadPixels)[i]; @@ -1534,5 +1498,5 @@ { const Int_t aidx = (*fGeom)[i].GetAidx(); - MCalibrationChargePix &apix = (MCalibrationChargePix&)chargecam->GetAverageArea(aidx); + MCalibrationChargePix &apix = (MCalibrationChargePix&)fCam->GetAverageArea(aidx); pix.SetPheFFactorMethod ( apix.GetPheFFactorMethod() ); @@ -1726,8 +1690,5 @@ } - MCalibrationChargeCam *chargecam = fIntensCam - ? (MCalibrationChargeCam*)fIntensCam->GetCam() : fCam; - - MCalibrationChargePix &avpix = (MCalibrationChargePix&)chargecam->GetAverageArea(0); + MCalibrationChargePix &avpix = (MCalibrationChargePix&)fCam->GetAverageArea(0); MCalibrationQEPix &qepix = (MCalibrationQEPix&) fQECam->GetAverageArea(0); @@ -1757,8 +1718,8 @@ // Set the results in the MCalibrationChargeCam // - chargecam->SetNumPhotonsFFactorMethod (avphotons); + fCam->SetNumPhotonsFFactorMethod (avphotons); if (avphotrelvar > 0.) - chargecam->SetNumPhotonsFFactorMethodErr(TMath::Sqrt( avphotrelvar * avphotons * avphotons)); + fCam->SetNumPhotonsFFactorMethodErr(TMath::Sqrt( avphotrelvar * avphotons * avphotons)); TArrayF lowlim (nareas); @@ -1775,6 +1736,6 @@ { - MCalibrationChargePix &pix = (MCalibrationChargePix&)(*chargecam)[i]; - MCalibrationQEPix &qpix = (MCalibrationQEPix&) (*fQECam) [i]; + MCalibrationChargePix &pix = (MCalibrationChargePix&)(*fCam)[i]; + MCalibrationQEPix &qpix = (MCalibrationQEPix&) (*fQECam)[i]; MBadPixelsPix &bad = (*fBadPixels)[i]; @@ -1895,6 +1856,5 @@ { - MCalibrationChargePix &pix = (MCalibrationChargePix&)(*chargecam)[i]; - + MCalibrationChargePix &pix = (MCalibrationChargePix&)(*fCam)[i]; MBadPixelsPix &bad = (*fBadPixels)[i]; @@ -1920,6 +1880,6 @@ { - MCalibrationChargePix &pix = (MCalibrationChargePix&)(*chargecam)[i]; - MCalibrationQEPix &qpix = (MCalibrationQEPix&) (*fQECam) [i]; + MCalibrationChargePix &pix = (MCalibrationChargePix&)(*fCam)[i]; + MCalibrationQEPix &qpix = (MCalibrationQEPix&)(*fQECam)[i]; if ((*fBadPixels)[i].IsUnsuitable(MBadPixelsPix::kUnsuitableRun)) @@ -1957,8 +1917,4 @@ return; - MCalibrationChargeCam *chargecam = fIntensCam - ? (MCalibrationChargeCam*)fIntensCam->GetCam() : fCam; - - // // Set the results in the MCalibrationChargeCam @@ -1969,5 +1925,5 @@ const Float_t photons = fBlindCam->GetFluxInsidePlexiglass() * (*fGeom)[0].GetA() / fQECam->GetPlexiglassQE(); - chargecam->SetNumPhotonsBlindPixelMethod(photons); + fCam->SetNumPhotonsBlindPixelMethod(photons); const Float_t photrelvar = fBlindCam->GetFluxInsidePlexiglassRelVar() @@ -1975,5 +1931,5 @@ if (photrelvar > 0.) - chargecam->SetNumPhotonsBlindPixelMethodErr(TMath::Sqrt( photrelvar * photons * photons)); + fCam->SetNumPhotonsBlindPixelMethodErr(TMath::Sqrt( photrelvar * photons * photons)); } @@ -2002,6 +1958,6 @@ } - MCalibrationChargePix &pix = (MCalibrationChargePix&)(*chargecam)[i]; - MGeomPix &geo = (*fGeom) [i]; + MCalibrationChargePix &pix = (MCalibrationChargePix&)(*fCam)[i]; + MGeomPix &geo = (*fGeom)[i]; const Float_t qe = pix.GetPheFFactorMethod() @@ -2046,7 +2002,4 @@ const UInt_t npixels = fGeom->GetNumPixels(); - MCalibrationChargeCam *chargecam = fIntensCam - ? (MCalibrationChargeCam*)fIntensCam->GetCam() : fCam; - if (!fPINDiode) return; @@ -2080,9 +2033,9 @@ continue; } - - MCalibrationChargePix &pix = (MCalibrationChargePix&)(*chargecam)[i]; - MGeomPix &geo = (*fGeom) [i]; - - const Float_t qe = pix.GetPheFFactorMethod() + + MCalibrationChargePix &pix = (MCalibrationChargePix&)(*fCam)[i]; + MGeomPix &geo = (*fGeom)[i]; + + const Float_t qe = pix.GetPheFFactorMethod() / fPINDiode->GetFluxOutsidePlexiglass() / geo.GetA(); @@ -2129,5 +2082,5 @@ // // - Print out statistics about BadPixels of type UnsuitableType_t -// - store numbers of bad pixels of each type in fCam or fIntensCam +// - store numbers of bad pixels of each type in fCam // Bool_t MCalibrationChargeCalc::FinalizeUnsuitablePixels() @@ -2143,6 +2096,4 @@ TArrayI unsuit(nareas); TArrayI unrel(nareas); - - MCalibrationChargeCam *chargecam = fIntensCam ? (MCalibrationChargeCam*)fIntensCam->GetCam() : fCam; Int_t unsuitcnt=0; @@ -2159,12 +2110,12 @@ unrelcnt += unrel[aidx]; - chargecam->SetNumUnsuitable(unsuit[aidx], aidx); - chargecam->SetNumUnreliable(unrel[aidx], aidx); + fCam->SetNumUnsuitable(unsuit[aidx], aidx); + fCam->SetNumUnreliable(unrel[aidx], aidx); } TArrayI counts(nareas); - for (Int_t i=0; iGetSize(); i++) + for (Int_t i=0; iGetSize(); i++) { - MCalibrationPix &pix = (*chargecam)[i]; + const MCalibrationPix &pix = (*fCam)[i]; if (pix.IsHiGainSaturation()) { Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.h =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.h (revision 8451) +++ /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.h (revision 8452) @@ -23,8 +23,6 @@ class MCalibrationChargePINDiode; class MHCalibrationChargeBlindCam; -class MCalibrationIntensityBlindCam; class MCalibrationBlindCam; class MCalibrationChargePix; -class MCalibrationIntensityChargeCam; class MCalibrationChargeCam; class MHCalibrationChargeCam; @@ -81,12 +79,12 @@ Int_t fNumProcessed; // Number of processed events (for Intensity calibration) - + + Bool_t fContinousCalibration; + // Pointers // MBadPixelsIntensityCam *fIntensBad; //! Bad Pixels MBadPixelsCam *fBadPixels; //! Bad Pixels - MCalibrationIntensityChargeCam *fIntensCam; //! Intensity Calibration results of all pixels MCalibrationChargeCam *fCam; //! Calibrated Charges results of all pixels MHCalibrationChargeCam *fHCam; //! Charges histograms of all pixels - MCalibrationIntensityBlindCam *fIntensBlind; //! Intensity Calibration results of the Blind Pixels MCalibrationBlindCam *fBlindCam; //! Calibrated Charges of the Blind Pixels MHCalibrationChargeBlindCam *fHBlindCam; //! Charges histograms of the Blind Pixels @@ -198,4 +196,6 @@ void SetUseExternalNumPhes(const Bool_t b=kTRUE) { b ? SETBIT(fFlags, kUseExternalNumPhes) : CLRBIT(fFlags, kUseExternalNumPhes); } + void SetContinousCalibration(const Bool_t b=kTRUE) { fContinousCalibration = b; } + // pointers void SetPedestals(MPedestalCam *cam) { fPedestals=cam; } @@ -217,6 +217,6 @@ void SetPheErrUpperLimit ( const Float_t f=fgPheErrUpperLimit ) { fPheErrUpperLimit = f; } void SetPulserColor ( const MCalibrationCam::PulserColor_t col ) { fPulserColor = col; } - - ClassDef(MCalibrationChargeCalc, 5) // Task calculating Calibration Containers and Quantum Efficiencies + + ClassDef(MCalibrationChargeCalc, 6) // Task calculating Calibration Containers and Quantum Efficiencies }; Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc (revision 8451) +++ /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc (revision 8452) @@ -1,4 +1,4 @@ /* ======================================================================== *\ -! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCam.cc,v 1.69 2006-10-17 17:18:40 tbretz Exp $ +! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCam.cc,v 1.70 2007-04-27 10:04:46 tbretz Exp $ ! -------------------------------------------------------------------------- ! @@ -216,17 +216,15 @@ void MCalibrationChargeCam::Clear(Option_t *o) { - + // DO NOT RESET THE HI-/LO-GAIN CONSTANTS SetFFactorMethodValid ( kFALSE ); - fNumPhotonsBlindPixelMethod = 0.; - fNumPhotonsFFactorMethod = 0.; - fNumPhotonsPINDiodeMethod = 0.; - fNumPhotonsBlindPixelMethodErr = 0.; - fNumPhotonsFFactorMethodErr = 0.; - fNumPhotonsPINDiodeMethodErr = 0.; + fNumPhotonsBlindPixelMethod = 0.; + fNumPhotonsFFactorMethod = 0.; + fNumPhotonsPINDiodeMethod = 0.; + fNumPhotonsBlindPixelMethodErr = 0.; + fNumPhotonsFFactorMethodErr = 0.; + fNumPhotonsPINDiodeMethodErr = 0.; MCalibrationCam::Clear(); - - return; } Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.cc =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.cc (revision 8451) +++ /trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.cc (revision 8452) @@ -64,4 +64,6 @@ #include "MLogManip.h" +#include "MMath.h" + #include "MParList.h" @@ -81,9 +83,9 @@ using namespace std; -const Float_t MCalibrationRelTimeCalc::fgRelTimeResolutionLimit = 0.05; +const Float_t MCalibrationRelTimeCalc::fgRelTimeResolutionLimit = 5.0; // -------------------------------------------------------------------------- // -// Default constructor. +// Default constructor. // // Sets all pointers to NULL @@ -98,10 +100,10 @@ : fGeom(NULL), fFlags(0) { - + fName = name ? name : "MCalibrationRelTimeCalc"; fTitle = title ? title : "Task to finalize the relative time calibration"; SetCheckFitResults ( kFALSE ); - SetCheckDeviatingBehavior( kFALSE ); + SetCheckDeviatingBehavior( kTRUE ); SetCheckHistOverflow ( kFALSE ); SetCheckOscillations ( kFALSE ); @@ -164,17 +166,9 @@ } - const UInt_t npixels = fGeom->GetNumPixels(); - for (UInt_t i=0; iGetNumPixels(); + for (UInt_t i=0; iGetNumPixels(); - const UInt_t nareas = fGeom->GetNumAreas(); - - TArrayF lowlim (nareas); - TArrayF upplim (nareas); - TArrayF areasum (nareas); - TArrayI numareavalid (nareas); - TArrayI useunreliable(nareas); - - // - // Apero loop: Count number of unreliable pixels: - // - for (UInt_t i=0; iGetNumPixels(); + const Int_t nareas = fGeom->GetNumAreas(); + + // Create an array capable of holding all pixels + TArrayF arr(npixels); + + for (Int_t aidx=0; aidx0) + arr[n++] = pix.GetTimePrecision(); } - // Calculate the rms out of sum2: - /* - areasum2[aidx] = (areasum2[aidx] - areasum[aidx]*areasum[aidx]/numareavalid[aidx]); - areasum2[aidx] /= (numareavalid[aidx]-1.); - */ - areasum [aidx] /= numareavalid[aidx]; - lowlim [aidx] = 0; - upplim [aidx] = areasum [aidx] + fRelTimeResolutionLimit; - - } - *fLog << endl; - - - for (UInt_t i=0; i upplim[aidx] ) + // Check the ratio of valid entries to the ratio of pixels + const Float_t ratio = 100*n/fGeom->GetNumPixWithAidx(aidx); + if (3*ratio<2) + *fLog << warn << "Area " << setw(4) << aidx << ": Only " << ratio << "% pixels with valid time resolution found." << endl; + + // Calculate median and median deviation + Double_t med; + const Double_t dev = MMath::MedianDev(n, arr.GetArray(), med); + + // Now find the outliers + for (Int_t i=0; i=hilim) + { + *fLog << warn << "Pixel " << setw(4) << i << ": Deviating time resolution: " + << Form("%4.2f", res) << " out of range " + << Form("[%4.2f,%4.2f]", lolim, hilim) << endl; + + (*fBadPixels)[i].SetUncalibrated(MBadPixelsPix::kDeviatingTimeResolution); + } } } @@ -373,6 +330,4 @@ // - MBadPixelsPix::kRelTimeRelErrNotValid // -// - Call MCalibrationPix::SetExcluded() for the bad pixels -// void MCalibrationRelTimeCalc::FinalizeBadPixels() { @@ -380,10 +335,9 @@ for (Int_t i=0; iGetSize(); i++) { - MBadPixelsPix &bad = (*fBadPixels)[i]; if (IsCheckDeviatingBehavior()) if (bad.IsUncalibrated(MBadPixelsPix::kDeviatingTimeResolution)) - bad.SetUnsuitable(MBadPixelsPix::kUnreliableRun); + bad.SetUnsuitable(MBadPixelsPix::kUnsuitableRun); if (IsCheckFitResults()) @@ -394,10 +348,4 @@ if (bad.IsUncalibrated(MBadPixelsPix::kRelTimeOscillating)) bad.SetUnsuitable(MBadPixelsPix::kUnreliableRun); - - if (bad.IsUnsuitable(MBadPixelsPix::kUnsuitableRun)) - { - MCalibrationRelTimePix &pix = (MCalibrationRelTimePix&)(*fCam)[i]; - pix.SetExcluded(); - } } @@ -460,5 +408,5 @@ void MCalibrationRelTimeCalc::PrintUncalibrated(const char *text, Int_t in, Int_t out) const { - *fLog << " " << setfill(' ') << setw(56) << setiosflags(ios::left) << text; + *fLog << " " << setfill(' ') << setw(48) << setiosflags(ios::left) << text; *fLog << " Inner: " << Form("%3i", in); *fLog << " Outer: " << Form("%3i", out); Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCam.cc =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCam.cc (revision 8451) +++ /trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCam.cc (revision 8452) @@ -131,5 +131,5 @@ *fLog << all << GetDescriptor() << ":" << endl; int id = 0; - + *fLog << all << "Calibrated pixels:" << endl; *fLog << all << endl; @@ -138,26 +138,26 @@ MCalibrationRelTimePix *pix; while ((pix=(MCalibrationRelTimePix*)Next())) - { - - if (!pix->IsExcluded()) - { - - *fLog << all - << Form("%s%4i%s%4.2f%s%4.2f%s%4.2f%s%4.2f","Pix ",pix->GetPixId(), - ": Offset: ",pix->GetTimeOffset()," +- ",pix->GetTimeOffsetErr(), - " Precision: ",pix->GetTimePrecision()," +- ",pix->GetTimePrecisionErr()) - << endl; + { + if (!pix->IsExcluded()) + { + *fLog << all + << "Pix " << Form("%4i", pix->GetPixId()) << ": " + << " Offset: " + << Form("%4.2f +- %4,2f", pix->GetTimeOffset(), pix->GetTimeOffsetErr()) + << " Precision: " + << Form("%4.2f +- %4.2f", pix->GetTimePrecision(), pix->GetTimePrecisionErr()) + << endl; id++; - } - } - + } + } + *fLog << all << id << " pixels" << endl; id = 0; - - + + *fLog << all << endl; *fLog << all << "Excluded pixels:" << endl; *fLog << all << endl; - + id = 0; @@ -177,8 +177,10 @@ while ((pix=(MCalibrationRelTimePix*)Next5())) { - *fLog << all - << Form("%s%4i%s%4.2f%s%4.2f%s%4.2f%s%4.2f","Average Area ",pix->GetPixId(), - ": Offset: ",pix->GetTimeOffset()," +- ",pix->GetTimeOffsetErr(), - " Precision: ",pix->GetTimePrecision()," +- ",pix->GetTimePrecisionErr()) + *fLog << all + << "Average Area " << Form("%4i", pix->GetPixId()) << ":" + << "Offset: " + << Form("%4.2f +- %4,2f", pix->GetTimeOffset(), pix->GetTimeOffsetErr()) + << " Precision: " + << Form("%4.2f +- %4.2f", pix->GetTimePrecision(), pix->GetTimePrecisionErr()) << endl; } @@ -187,8 +189,10 @@ while ((pix=(MCalibrationRelTimePix*)Next5())) { - *fLog << all - << Form("%s%4i%s%4.2f%s%4.2f%s%4.2f%s%4.2f","Average Sector ",pix->GetPixId(), - ": Offset: ",pix->GetTimeOffset()," +- ",pix->GetTimeOffsetErr(), - " Precision: ",pix->GetTimePrecision()," +- ",pix->GetTimePrecisionErr()) + *fLog << all + << "Average Sector " << Form("%4i", pix->GetPixId()) << ":" + << "Offset: " + << Form("%4.2f +- %4.2f", pix->GetTimeOffset(), pix->GetTimeOffsetErr()) + << " Precision: " + << Form("%4.2f +- %4.2f", pix->GetTimePrecision(), pix->GetTimePrecisionErr()) << endl; } @@ -232,5 +236,5 @@ return kFALSE; val = pix.GetMean(); - break; + return val!=-1.; case 1: if (pix.IsExcluded()) @@ -257,6 +261,6 @@ } - return val!=-1.; - -} - + return val>=0; + +} + Index: /trunk/MagicSoft/Mars/mcalib/Makefile =================================================================== --- /trunk/MagicSoft/Mars/mcalib/Makefile (revision 8451) +++ /trunk/MagicSoft/Mars/mcalib/Makefile (revision 8452) @@ -39,6 +39,4 @@ MCalibrationPatternDecode.cc \ MCalibrateRelTimes.cc \ - MCalibrationIntensityCam.cc \ - MCalibrationIntensityChargeCam.cc \ MCalibrationCam.cc \ MCalibrationPix.cc \ Index: /trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc =================================================================== --- /trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc (revision 8451) +++ /trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc (revision 8452) @@ -78,5 +78,4 @@ #include "MLogManip.h" -#include "MCalibrationIntensityCam.h" #include "MCalibrationCam.h" #include "MCalibrationPix.h" @@ -144,5 +143,5 @@ fHistXTitle(gsHistXTitle),fHistYTitle(gsHistYTitle), fCurrentNumEvts(0), fColor(MCalibrationCam::kNONE), - fBadPixels(NULL), fIntensCam(NULL), fCam(NULL), fGeom(NULL), + fBadPixels(NULL), fCam(NULL), fGeom(NULL), fRunHeader(NULL) { @@ -606,9 +605,13 @@ if (!fBadPixels) { + /* fBadPixels = (MBadPixelsCam*)pList->FindCreateObj(AddSerialNumber("MBadPixelsCam")); if (!fBadPixels) return kFALSE; - fBadPixels->InitSize(npixels); + fBadPixels->InitSize(npixels); + */ + *fLog << err << "MBadPixelsCam not found... abort." << endl; + return kFALSE; } @@ -762,5 +765,5 @@ } else - InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadArea(j) : fCam->GetAverageBadArea(j),j); + InitHists(pix, fCam->GetAverageBadArea(j),j); } } @@ -775,6 +778,6 @@ pix.SetBinning(fNbins*(Int_t)TMath::Sqrt((Float_t)npixels/nsectors), fFirst, fLast); - - InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadSector(j) : fCam->GetAverageBadSector(j),j); + + InitHists(pix, fCam->GetAverageBadSector(j),j); } } @@ -835,5 +838,5 @@ } else - InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadArea(j) : fCam->GetAverageBadArea(j),j); + InitHists(pix, fCam->GetAverageBadArea(j),j); } } @@ -849,5 +852,5 @@ pix.SetBinning(fNbins*(Int_t)TMath::Sqrt((Float_t)npixels/nsectors), fFirst, fLast); - InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadSector(j) : fCam->GetAverageBadSector(j),j); + InitHists(pix, fCam->GetAverageBadSector(j),j); } } @@ -1034,7 +1037,5 @@ // ------------------------------------------------------------- // -// - Searches for the CalibrationIntensity*Cam corresponding to 'name'. -// - In case, it does not exist in the parameter list, it searches -// for the corresponding MCalibration*Cam. +// - Searches for the Calibration*Cam corresponding to 'name'. // - Initializes the MCalibration*Cam, if not yet done. // @@ -1042,27 +1043,18 @@ { - TString intensname = "MCalibrationIntensity"; - intensname += name; - intensname += "Cam"; - - TString ordname = "MCalibration"; - ordname += name; - ordname += "Cam"; - - fIntensCam = (MCalibrationIntensityCam*)plist->FindObject(AddSerialNumber(intensname)); - if (fIntensCam) - *fLog << inf << "Found " << intensname << "... " << endl; - else - { - fCam = (MCalibrationCam*)plist->FindObject(AddSerialNumber(ordname)); + TString ordname = "MCalibration"; + ordname += name; + ordname += "Cam"; + + fCam = (MCalibrationCam*)plist->FindObject(AddSerialNumber(ordname)); + if (!fCam) + { + fCam = (MCalibrationCam*)plist->FindCreateObj(AddSerialNumber(ordname)); if (!fCam) - { - fCam = (MCalibrationCam*)plist->FindCreateObj(AddSerialNumber(ordname)); - if (!fCam) - return kFALSE; - - fCam->Init(*fGeom); - } - } + return kFALSE; + + fCam->Init(*fGeom); + } + return kTRUE; } @@ -1182,12 +1174,12 @@ if (!IsAverageing()) return; - - MCalibrationCam *cam = fIntensCam ? fIntensCam->GetCam() : fCam; + + MCalibrationCam *cam = fCam; if (!cam) return; - + for (UInt_t j=0; jGetNumAreas(); j++) { - + MCalibrationPix &pix = cam->GetAverageArea(j); @@ -1241,17 +1233,17 @@ if (hist.IsEmpty()) { - *fLog << warn << "Pixel " << setw(4) << pix.GetPixId() << ": Hi-Gain histogram empty." << endl; + //*fLog << warn << "Pixel " << setw(4) << pix.GetPixId() << ": Hi-Gain histogram empty." << endl; + //bad.SetUncalibrated( fittyp ); + return; + } + if (hist.IsOnlyOverflow()) + { + *fLog << warn << "Pixel " << setw(4) << pix.GetPixId() << ": Hi-Gain histogram contains only overflows (Check Binning!)." << endl; bad.SetUncalibrated( fittyp ); return; } - if (hist.IsOnlyOverflow()) - { - *fLog << warn << "Pixel " << setw(4) << pix.GetPixId() << ": Hi-Gain histogram contains only overflows." << endl; - bad.SetUncalibrated( fittyp ); - return; - } if (hist.IsOnlyUnderflow()) { - *fLog << warn << "Pixel " << setw(4) << pix.GetPixId() << ": Hi-Gain histogram contains only underflows." << endl; + *fLog << warn << "Pixel " << setw(4) << pix.GetPixId() << ": Hi-Gain histogram contains only underflows (Check Binning!)." << endl; bad.SetUncalibrated( fittyp ); return; @@ -1346,17 +1338,17 @@ if (hist.IsEmpty()) { - // *fLog << warn << "Pixel " << setw(4) << pix.GetPixId() << ": Lo-Gain histogram empty." << endl; + //*fLog << warn << "Pixel " << setw(4) << pix.GetPixId() << ": Lo-Gain histogram empty." << endl; + //bad.SetUncalibrated( fittyp ); // FIXME: Combine with HiGain! + return; + } + if (hist.IsOnlyOverflow()) + { + *fLog << warn << "Pixel " << setw(4) << pix.GetPixId() << ": Lo-Gain histogram contains only overflows (Check Binning!)." << endl; bad.SetUncalibrated( fittyp ); return; } - if (hist.IsOnlyOverflow()) - { - *fLog << warn << "Pixel " << setw(4) << pix.GetPixId() << ": Lo-Gain histogram contains only overflows." << endl; - bad.SetUncalibrated( fittyp ); - return; - } if (hist.IsOnlyUnderflow()) { - *fLog << warn << "Pixel " << setw(4) << pix.GetPixId() << ": Lo-Gain histogram contains only underflows." << endl; + *fLog << warn << "Pixel " << setw(4) << pix.GetPixId() << ": Lo-Gain histogram contains only underflows (Check Binning!)." << endl; bad.SetUncalibrated( fittyp ); return; Index: /trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.h =================================================================== --- /trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.h (revision 8451) +++ /trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.h (revision 8452) @@ -29,5 +29,4 @@ class MGeomCam; class MRawRunHeader; -class MCalibrationIntensityCam; class MCalibrationCam; class MCalibrationPix; @@ -100,5 +99,4 @@ MBadPixelsCam *fBadPixels; //! Bad Pixels storage container - MCalibrationIntensityCam *fIntensCam; //! Intensity Calibration Cam with the results MCalibrationCam *fCam; //! Calibration Cam with the results MGeomCam *fGeom; //! Camera geometry Index: /trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc =================================================================== --- /trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc (revision 8451) +++ /trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc (revision 8452) @@ -1,4 +1,4 @@ /* ======================================================================== *\ -! $Name: not supported by cvs2svn $:$Id: MHCalibrationChargeCam.cc,v 1.57 2007-04-25 14:39:43 tbretz Exp $ +! $Name: not supported by cvs2svn $:$Id: MHCalibrationChargeCam.cc,v 1.58 2007-04-27 10:04:47 tbretz Exp $ ! -------------------------------------------------------------------------- ! @@ -143,5 +143,4 @@ #include "MHCalibrationPix.h" -#include "MCalibrationIntensityCam.h" #include "MCalibrationChargeCam.h" #include "MCalibrationChargePix.h" @@ -339,5 +338,5 @@ // Gets or creates the pointers to: // - MExtractedSignalCam -// - MCalibrationChargeCam or MCalibrationIntensityChargeCam +// - MCalibrationChargeCam // - MBadPixelsCam // @@ -472,5 +471,5 @@ pix.SetBinningAbsTime(higainsamples, -0.5, higainsamples-0.5); - InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadArea(j) : fCam->GetAverageBadArea(j),j); + InitHists(pix, fCam->GetAverageBadArea(j),j); h = pix.GetHAbsTime(); @@ -498,5 +497,5 @@ pix.SetBinningAbsTime(higainsamples, -0.5, higainsamples-0.5); - InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadSector(j) : fCam->GetAverageBadSector(j),j); + InitHists(pix, fCam->GetAverageBadSector(j),j); h = pix.GetHAbsTime(); @@ -582,5 +581,5 @@ pix.SetBinningAbsTime(logainsamples, -0.5, logainsamples-0.5); - InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadArea(j) : fCam->GetAverageBadArea(j),j); + InitHists(pix, fCam->GetAverageBadArea(j),j); h = pix.GetHAbsTime(); @@ -609,5 +608,5 @@ pix.SetBinningAbsTime(logainsamples, -0.5, logainsamples-0.5); - InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadSector(j) : fCam->GetAverageBadSector(j),j); + InitHists(pix, fCam->GetAverageBadSector(j),j); h = pix.GetHAbsTime(); @@ -862,6 +861,4 @@ TH1F *h = NULL; - MCalibrationCam *chargecam = fIntensCam ? fIntensCam->GetCam() : fCam; - const Int_t hifirst = fSignal->GetFirstUsedSliceHiGain(); const Int_t hilast = fSignal->GetLastUsedSliceHiGain(); @@ -871,11 +868,10 @@ for (Int_t i=0; iGetSize(); i++) { - + MHCalibrationChargePix &histhi = (MHCalibrationChargePix&)(*this)[i]; - if (histhi.IsExcluded()) continue; - MCalibrationChargePix &pix = (MCalibrationChargePix&)(*chargecam)[i] ; + MCalibrationChargePix &pix = (MCalibrationChargePix&)(*fCam)[i]; const Int_t numsat = histhi.GetSaturated(); @@ -935,5 +931,5 @@ } - MCalibrationChargePix &pix = (MCalibrationChargePix&)(*chargecam)[i] ; + MCalibrationChargePix &pix = (MCalibrationChargePix&)(*fCam)[i] ; if (!pix.IsHiGainSaturation()) continue; @@ -966,5 +962,5 @@ MHCalibrationChargePix &histhi = (MHCalibrationChargePix&)GetAverageHiGainArea(j); - MCalibrationChargePix &pix = (MCalibrationChargePix&)chargecam->GetAverageArea(j); + MCalibrationChargePix &pix = (MCalibrationChargePix&)fCam->GetAverageArea(j); if (histhi.GetSaturated() > fNumHiGainSaturationLimit*histhi.GetHGausHist()->GetEntries()) @@ -976,5 +972,5 @@ } - MBadPixelsPix &bad = chargecam->GetAverageBadArea(j); + MBadPixelsPix &bad = fCam->GetAverageBadArea(j); FinalizeAbsTimes(histhi, pix, bad, hifirst, hilast); } @@ -994,12 +990,11 @@ } - MCalibrationChargePix &pix = (MCalibrationChargePix&)chargecam->GetAverageArea(j); - + MCalibrationChargePix &pix = (MCalibrationChargePix&)fCam->GetAverageArea(j); if (pix.IsHiGainSaturation()) { - MBadPixelsPix &bad = chargecam->GetAverageBadArea(j); + MBadPixelsPix &bad = fCam->GetAverageBadArea(j); FinalizeAbsTimes(histlo, pix, bad, lofirst, lolast); } - + } @@ -1008,5 +1003,5 @@ MHCalibrationChargePix &histhi = (MHCalibrationChargePix&)GetAverageHiGainSector(j); - MCalibrationChargePix &pix = (MCalibrationChargePix&)chargecam->GetAverageSector(j); + MCalibrationChargePix &pix = (MCalibrationChargePix&)fCam->GetAverageSector(j); if (histhi.GetSaturated() > fNumHiGainSaturationLimit*histhi.GetHGausHist()->GetEntries()) @@ -1018,5 +1013,5 @@ } - MBadPixelsPix &bad = chargecam->GetAverageBadSector(j); + MBadPixelsPix &bad = fCam->GetAverageBadSector(j); FinalizeAbsTimes(histhi, pix, bad, hifirst, hilast); } @@ -1025,8 +1020,8 @@ for (Int_t j=0; jGetSize(); j++) { - + MHCalibrationChargePix &histlo = (MHCalibrationChargePix&)GetAverageLoGainSector(j); - MBadPixelsPix &bad = chargecam->GetAverageBadSector(j); - + MBadPixelsPix &bad = fCam->GetAverageBadSector(j); + if (histlo.GetSaturated() > fNumLoGainSaturationLimit*histlo.GetHGausHist()->GetEntries()) { @@ -1037,7 +1032,6 @@ continue; } - - MCalibrationChargePix &pix = (MCalibrationChargePix&)chargecam->GetAverageSector(j); - + + MCalibrationChargePix &pix = (MCalibrationChargePix&)fCam->GetAverageSector(j); if (pix.IsHiGainSaturation()) FinalizeAbsTimes(histlo, pix, bad, lofirst, lolast); @@ -1047,5 +1041,5 @@ // Perform the fitting for the High Gain (done in MHCalibrationCam) // - FitHiGainArrays(*chargecam, *fBadPixels, + FitHiGainArrays(*fCam, *fBadPixels, MBadPixelsPix::kHiGainNotFitted, MBadPixelsPix::kHiGainOscillating); @@ -1055,5 +1049,5 @@ // if (IsLoGain()) - FitLoGainArrays(*chargecam, *fBadPixels, + FitLoGainArrays(*fCam, *fBadPixels, MBadPixelsPix::kLoGainNotFitted, MBadPixelsPix::kLoGainOscillating); @@ -1071,5 +1065,5 @@ continue; - MCalibrationChargePix &pix = (MCalibrationChargePix&)(*chargecam)[i] ; + MCalibrationChargePix &pix = (MCalibrationChargePix&)(*fCam)[i]; if (!pix.IsHiGainSaturation()) continue; @@ -1143,11 +1137,9 @@ { - MCalibrationCam *chargecam = fIntensCam ? fIntensCam->GetCam() : fCam; - for (Int_t i=0; iGetSize(); i++) { - - MBadPixelsPix &bad = (*fBadPixels)[i]; - MCalibrationPix &pix = (*chargecam)[i]; + + MBadPixelsPix &bad = (*fBadPixels)[i]; + MCalibrationPix &pix = (*fCam)[i]; if (bad.IsUncalibrated(MBadPixelsPix::kHiGainNotFitted)) Index: /trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc =================================================================== --- /trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc (revision 8451) +++ /trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc (revision 8452) @@ -125,5 +125,5 @@ const Float_t MHCalibrationRelTimeCam::fgNumHiGainSaturationLimit = 0.25; -const UInt_t MHCalibrationRelTimeCam::fgReferencePixel = 1; +//const UInt_t MHCalibrationRelTimeCam::fgReferencePixel = 1; const Int_t MHCalibrationRelTimeCam::fgNbins = 400; const Axis_t MHCalibrationRelTimeCam::fgFirst = -9.975; @@ -141,5 +141,4 @@ // // Sets: -// - fReferencePixel to fgReferencePixel // - fNbins to fgNbins // - fFirst to fgFirst @@ -159,5 +158,5 @@ SetNumHiGainSaturationLimit(fgNumHiGainSaturationLimit); - SetReferencePixel(); +// SetReferencePixel(); SetBinning(fgNbins, fgFirst, fgLast); @@ -263,11 +262,4 @@ return kFALSE; - MArrivalTimeCam *signal = (MArrivalTimeCam*)pList->FindObject("MArrivalTimeCam"); - if (!signal) - { - *fLog << err << "MArrivalTimeCam not found... abort." << endl; - return kFALSE; - } - const Int_t npixels = fGeom->GetNumPixels(); const Int_t nsectors = fGeom->GetNumSectors(); @@ -313,5 +305,5 @@ return kFALSE; } - + const Int_t npixels = fGeom->GetNumPixels(); const Int_t nareas = fGeom->GetNumAreas(); @@ -327,15 +319,17 @@ fNumsectorlo.Reset(); - const MArrivalTimePix &refpix = (*arrtime)[fReferencePixel]; - // FIXME: What do we do if pixel is invalid? - if (!refpix.IsArrivalTimeValid()) + TArrayF arr(npixels); + Int_t n = 0; + for (Int_t i=0; i0) + continue; + + const MArrivalTimePix &pix = (*arrtime)[i]; + if (pix.IsHiGainValid() && !pix.IsHiGainSaturated()) + arr[n++] = pix.GetArrivalTimeHiGain(); } - const Float_t reftime = refpix.GetArrivalTime(); -// refpix.IsHiGainSaturated() -// ? refpix.GetArrivalTimeLoGain() : refpix.GetArrivalTimeHiGain(); + const Float_t reftime = TMath::Median(n, arr.GetArray()); for (Int_t i=0; i0) + { + MHCalibrationPix &histhi = GetAverageHiGainArea(j); + if (IsOscillations()) + histhi.FillHistAndArray(fSumareahi[j]/fNumareahi[j]); + else + histhi.FillHist(fSumareahi[j]/fNumareahi[j]); + } + + if (IsLoGain() && fNumarealo[j]>0) + { MHCalibrationPix &histlo = GetAverageLoGainArea(j); - if (IsOscillations()) - histlo.FillHistAndArray(fNumarealo[j] == 0 ? 0. : fSumarealo[j]/fNumarealo[j]); + if (IsOscillations()) + histlo.FillHistAndArray(fSumarealo[j]/fNumarealo[j]); else - histlo.FillHist(fNumarealo[j] == 0 ? 0. : fSumarealo[j]/fNumarealo[j]); - } - } - + histlo.FillHist(fSumarealo[j]/fNumarealo[j]); + } + } + for (Int_t j=0; j0) + { + MHCalibrationPix &histhi = GetAverageHiGainSector(j); + if (IsOscillations()) + histhi.FillHistAndArray(fSumsectorhi[j]/fNumsectorhi[j]); + else + histhi.FillHist(fSumsectorhi[j]/fNumsectorhi[j]); + } + + if (IsLoGain() && fNumsectorlo[j]>0) + { MHCalibrationPix &histlo = GetAverageLoGainSector(j); - if (IsOscillations()) - histlo.FillHistAndArray(fNumsectorlo[j] == 0 ? 0. : fSumsectorlo[j]/fNumsectorlo[j]); + if (IsOscillations()) + histlo.FillHistAndArray(fSumsectorlo[j]/fNumsectorlo[j]); else - histlo.FillHist(fNumsectorlo[j] == 0 ? 0. : fSumsectorlo[j]/fNumsectorlo[j]); - } - } + histlo.FillHist(fSumsectorlo[j]/fNumsectorlo[j]); + } + } return kTRUE; @@ -459,5 +461,5 @@ if (histhi.IsExcluded()) continue; - + const Int_t aidx = (*fGeom)[i].GetAidx(); const Int_t sector = (*fGeom)[i].GetSector(); @@ -562,9 +564,9 @@ if (bad.IsUncalibrated( MBadPixelsPix::kRelTimeNotFitted )) - bad.SetUnsuitable( MBadPixelsPix::kUnreliableRun ); + bad.SetUnsuitable( MBadPixelsPix::kUnreliableRun ); if (bad.IsUncalibrated( MBadPixelsPix::kRelTimeOscillating)) - bad.SetUnsuitable( MBadPixelsPix::kUnreliableRun ); - + bad.SetUnsuitable( MBadPixelsPix::kUnreliableRun ); + } } @@ -577,19 +579,19 @@ // ============== // -// 0: Fitted Mean Relative Arrival Time in FADC slices (MHGausEvents::GetMean() -// 1: Error Mean Relative Arrival Time in FADC slices (MHGausEvents::GetMeanErr() +// 0: Fitted Mean Relative Arrival Time in FADC slices (MHGausEvents::GetMean() +// 1: Error Mean Relative Arrival Time in FADC slices (MHGausEvents::GetMeanErr() // 2: Sigma fitted Relative Arrival Time in FADC slices (MHGausEvents::GetSigma() -// 3: Error Sigma Relative Arrival Time in FADC slices (MHGausEvents::GetSigmaErr() +// 3: Error Sigma Relative Arrival Time in FADC slices (MHGausEvents::GetSigmaErr() // // Useful variables derived from the fit results: // ============================================= // -// 4: Returned probability of Gauss fit (calls: MHGausEvents::GetProb()) +// 4: Returned probability of Gauss fit (MHGausEvents::GetProb()) // // Localized defects: // ================== // -// 5: Gaus fit not OK (calls: MHGausEvents::IsGausFitOK()) -// 6: Fourier spectrum not OK (calls: MHGausEvents::IsFourierSpectrumOK()) +// 5: Gaus fit not OK (MHGausEvents::IsGausFitOK()) +// 6: Fourier spectrum not OK (MHGausEvents::IsFourierSpectrumOK()) // Bool_t MHCalibrationRelTimeCam::GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type) const @@ -849,10 +851,4 @@ } - if (IsEnvDefined(env, prefix, "ReferencePixel", print)) - { - SetReferencePixel(GetEnvValue(env, prefix, "ReferencePixel", (Int_t)fReferencePixel)); - rc = kTRUE; - } - TEnv refenv(fReferenceFile); Index: /trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.h =================================================================== --- /trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.h (revision 8451) +++ /trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.h (revision 8452) @@ -22,5 +22,4 @@ static const Float_t fgNumHiGainSaturationLimit; //! The default for fNumHiGainSaturationLimit (now at: 0.25) - static const UInt_t fgReferencePixel; //! Default for fReferencePixel (now set to: 1) static const Int_t fgNbins; //! Default number of bins (now set to: 900 ) static const Axis_t fgFirst; //! Default lower histogram limit (now set to: -13.5 ) @@ -35,5 +34,4 @@ static const TString fgReferenceFile; //! default for fReferenceFile ("mjobs/calibrationref.rc") - UInt_t fReferencePixel; // The reference pixel for rel. times Float_t fInnerRefTime; // The reference mean arrival time inner pixels Float_t fOuterRefTime; // The reference mean arrival time outer pixels @@ -66,11 +64,8 @@ ~MHCalibrationRelTimeCam() {} - UInt_t GetReferencePixel() const { return fReferencePixel; } - // Clone TObject *Clone(const char *name="") const; // Setters - void SetReferencePixel( const UInt_t i=fgReferencePixel ) { fReferencePixel = i; } void SetReferenceFile ( const TString ref=fgReferenceFile ) { fReferenceFile = ref; } Index: /trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc =================================================================== --- /trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc (revision 8451) +++ /trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc (revision 8452) @@ -69,5 +69,4 @@ #include "MCalibConstCam.h" -#include "MCalibrationIntensityChargeCam.h" #include "MHCalibrationChargeCam.h" @@ -125,5 +124,5 @@ // MJCalibrateSignal::MJCalibrateSignal(const char *name, const char *title) - : fExtractor(0), fIsInterlaced(kTRUE), fIsRelTimesUpdate(kFALSE), fIsMovieMode(kFALSE) + : fExtractor(0), fIsInterlaced(kTRUE), fIsRelTimesUpdate(kTRUE), fIsMovieMode(kFALSE) { fName = name ? name : "MJCalibrateSignal"; @@ -250,6 +249,4 @@ // Read File - MCalibrationIntensityChargeCam ichcam; - MHCalibrationChargeCam hchacam; MHCalibrationChargeBlindCam hbndcam; @@ -276,5 +273,4 @@ if (fIsInterlaced) { - interlacedcont.Add(&ichcam); interlacedcont.Add(&hchacam); if (IsUseBlindPixel()) @@ -531,4 +527,5 @@ MCalibrationChargeCalc chcalc; + chcalc.SetContinousCalibration(); chcalc.SetExtractor(extractor3); @@ -546,5 +543,5 @@ // - // Intensity Calibration histogramming + // Calibration histogramming // MFillH filpin(&hpndiod, "MExtractedSignalPINDiode", "FillPINDiode"); @@ -695,5 +692,5 @@ tlist3.SetFilter(&fcalib); - //MFDataPhrase filcalco("MCalibrationIntensityConstCam.IsReadyToSave>0.5", "CalibConstFilter"); + //MFDataPhrase filcalco("MCalibrationConstCam.IsReadyToSave>0.5", "CalibConstFilter"); if (fIsInterlaced) { Index: /trunk/MagicSoft/Mars/mjobs/MJCalibration.cc =================================================================== --- /trunk/MagicSoft/Mars/mjobs/MJCalibration.cc (revision 8451) +++ /trunk/MagicSoft/Mars/mjobs/MJCalibration.cc (revision 8452) @@ -19,5 +19,5 @@ ! Author(s): Markus Gaug, 02/2004 ! -! Copyright: MAGIC Software Development, 2000-2005 +! Copyright: MAGIC Software Development, 2000-2007 ! ! @@ -218,14 +218,13 @@ fRefConvFADC2PheInner = 0.14; fRefConvFADC2PheOuter = 0.52; - fRefQEInner = 0.18; + fRefQEInner = 0.18; fRefQEOuter = 0.12; - fRefArrivalTimeInner = 4.5; + fRefArrivalTimeInner = 4.5; fRefArrivalTimeOuter = 5.0; - fRefArrivalTimeRmsInner = 0.5; + fRefArrivalTimeRmsInner = 0.5; fRefArrivalTimeRmsOuter = 0.5; - fRefTimeOffsetInner = -0.23; - fRefTimeOffsetOuter = 0.39; - fRefTimeResolutionInner = 0.153; - fRefTimeResolutionOuter = 0.128; + fRefTimeOffsetOuter = 0.62; + fRefTimeResolutionInner = 0.12; + fRefTimeResolutionOuter = 0.09; } @@ -813,5 +812,5 @@ // for the datacheck, fix the ranges!! // - const Double_t max = 11.; + const Double_t max = 12.; obj8->SetMinimum(0.); obj8->SetMaximum(max); @@ -825,5 +824,5 @@ const Int_t numcol = gStyle->GetNumberOfColors()-3; - TPaveText *pave = new TPaveText(0.05,0.02,0.975,0.99); + TPaveText *pave = new TPaveText(0.05,0.02,0.975,0.999); pave->SetBit(kCanDelete); pave->ConvertNDCtoPad(); @@ -866,11 +865,15 @@ t17->SetTextColor(gStyle->GetColorPalette(Int_t(9./max*numcol))); t17->SetTextAlign(12); + TText *t18 = pave->AddText(Form("Deviating Rel. Arrival Time RMS: %3i pixels", + CountBadPixels(&disp24,10 ))); + t18->SetTextColor(gStyle->GetColorPalette(Int_t(10./max*numcol))); + t18->SetTextAlign(12); TText *t15= pave->AddText(Form("Too many Low-Gain Blackout Events: %3i pixels", - CountBadPixels(&disp24,10 ))); - t15->SetTextColor(gStyle->GetColorPalette(Int_t(10./max*numcol))); + CountBadPixels(&disp24,11 ))); + t15->SetTextColor(gStyle->GetColorPalette(Int_t(11./max*numcol))); t15->SetTextAlign(12); TText *t14= pave->AddText(Form("Previously Excluded: %3i pixels", - CountBadPixels(&disp24,11))); - t14->SetTextColor(gStyle->GetColorPalette(Int_t(11./max*numcol))); + CountBadPixels(&disp24,12))); + t14->SetTextColor(gStyle->GetColorPalette(Int_t(12./max*numcol))); t14->SetTextAlign(12); pave->Draw(); @@ -903,5 +906,5 @@ gStyle->SetPalette(1); - TPaveText *pave2 = new TPaveText(0.025,0.02,0.95,0.99); + TPaveText *pave2 = new TPaveText(0.025,0.02,0.95,0.999); pave2->SetBit(kCanDelete); pave2->ConvertNDCtoPad(); @@ -1239,5 +1242,5 @@ break; case 5: - l1 = line.DrawLine(0, fRefTimeOffsetInner, x, fRefTimeOffsetInner ); + l1 = line.DrawLine(0, 0, x, 0); break; case 6: @@ -1391,5 +1394,4 @@ // RefArrivalTimeRmsOuter // -// RefTimeOffsetInner // RefTimeOffsetOuter // RefTimeResolutionInner @@ -1425,5 +1427,4 @@ fRefArrivalTimeRmsInner = refenv.GetValue("RefArrivalTimeRmsInner",fRefArrivalTimeRmsInner); fRefArrivalTimeRmsOuter = refenv.GetValue("RefArrivalTimeRmsOuter",fRefArrivalTimeRmsOuter); - fRefTimeOffsetInner = refenv.GetValue("RefTimeOffsetInner",fRefTimeOffsetInner); fRefTimeOffsetOuter = refenv.GetValue("RefTimeOffsetOuter",fRefTimeOffsetOuter); fRefTimeResolutionInner = refenv.GetValue("RefTimeResolutionInner",fRefTimeResolutionInner); @@ -1894,10 +1895,4 @@ tlist.AddToList(&cont); - if (IsRelTimes()) - { - tlist.AddToList(&filltme); - tlist.AddToList(&timecalc); - } - tlist.AddToList(&fillcam); @@ -1909,4 +1904,9 @@ tlist.AddToList(&calcalc); + if (IsRelTimes()) + { + tlist.AddToList(&filltme); + tlist.AddToList(&timecalc); + } MHCamEvent evt2(0, "Extra'd", "Extracted Calibration Signal;;S [cnts/sl]"); Index: /trunk/MagicSoft/Mars/mjobs/calibrationref.rc =================================================================== --- /trunk/MagicSoft/Mars/mjobs/calibrationref.rc (revision 8451) +++ /trunk/MagicSoft/Mars/mjobs/calibrationref.rc (revision 8452) @@ -63,8 +63,7 @@ # Relative Time Calibration: # -RefTimeOffsetInner: -0.23 -RefTimeOffsetOuter: 0.39 -RefTimeResolutionInner: 0.153 -RefTimeResolutionOuter: 0.128 +RefTimeOffsetOuter: 0.62 +RefTimeResolutionInner: 0.12 +RefTimeResolutionOuter: 0.09 # # Mean Absolute Time: Index: /trunk/MagicSoft/Mars/mjobs/calibrationref_Dec04.rc =================================================================== --- /trunk/MagicSoft/Mars/mjobs/calibrationref_Dec04.rc (revision 8451) +++ /trunk/MagicSoft/Mars/mjobs/calibrationref_Dec04.rc (revision 8452) @@ -63,8 +63,7 @@ # Relative Time Calibration: # -RefTimeOffsetInner: -0.23 -RefTimeOffsetOuter: 0.39 -RefTimeResolutionInner: 0.153 -RefTimeResolutionOuter: 0.128 +RefTimeOffsetOuter: 0.62 +RefTimeResolutionInner: 0.12 +RefTimeResolutionOuter: 0.09 # # Mean Absolute Time: Index: /trunk/MagicSoft/Mars/mjobs/calibrationref_Nov04.rc =================================================================== --- /trunk/MagicSoft/Mars/mjobs/calibrationref_Nov04.rc (revision 8451) +++ /trunk/MagicSoft/Mars/mjobs/calibrationref_Nov04.rc (revision 8452) @@ -63,8 +63,7 @@ # Relative Time Calibration: # -RefTimeOffsetInner: -0.23 -RefTimeOffsetOuter: 0.39 -RefTimeResolutionInner: 0.153 -RefTimeResolutionOuter: 0.128 +RefTimeOffsetOuter: 0.62 +RefTimeResolutionInner: 0.12 +RefTimeResolutionOuter: 0.09 # # Mean Absolute Time: Index: /trunk/MagicSoft/Mars/resources/calibrationref_mux.rc =================================================================== --- /trunk/MagicSoft/Mars/resources/calibrationref_mux.rc (revision 8451) +++ /trunk/MagicSoft/Mars/resources/calibrationref_mux.rc (revision 8452) @@ -30,8 +30,8 @@ # TimeOffsetMin: -9. -TimeOffsetMax: 9. +TimeOffsetMax: 12. -TimeResolutionMin: 1. -TimeResolutionMax: 1.5 +TimeResolutionMin: 0.45 +TimeResolutionMax: 1.25 ###################################################################### @@ -68,8 +68,7 @@ # Relative Time Calibration: # -RefTimeOffsetInner: -3.5 -RefTimeOffsetOuter: 2 -RefTimeResolutionInner: 1.25 -RefTimeResolutionOuter: 1.1 +RefTimeOffsetOuter: 5.5 +RefTimeResolutionInner: 0.9 +RefTimeResolutionOuter: 0.7 #