Index: /trunk/MagicSoft/Mars/Changelog =================================================================== --- /trunk/MagicSoft/Mars/Changelog (revision 4541) +++ /trunk/MagicSoft/Mars/Changelog (revision 4542) @@ -23,6 +23,14 @@ 2004/08/06: Markus Gaug + * mcalib/MCalibrationTestCalc.[h,cc] + * mcalib/Makefile + * mcalib/CalibLinkDef.h + - new class to retrieve the results of MHCalbirationTestCam + - outputs the results of the bad pixels interpolation and the + new relative flat-fielding of the camera. + * mjobs/MJExtractCalibTest.cc - uncomment (and use) the interpolation of bad pixels + - use the class MCalibrationTestCalc * mcalib/MHCalibrationChargeHiGainPix.cc Index: /trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.cc =================================================================== --- /trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.cc (revision 4541) +++ /trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.cc (revision 4542) @@ -63,9 +63,10 @@ // BIT(13): kMeanTimeInLast2Bins : The signal has its mean maximum in the last two used FADC slice - signal extractor bad // BIT(14): kDeviatingNumPhes : The calculated number of photo-electrons deviates too much from the mean - inconsistency -// BIT(15): kDeviatingFFactor : The calculated overall F-Factor deviates too much from the mean - inconsistency +// BIT(15): kDeviatingNumPhots : The calculated number of calibrated photons deviates too much from the mean - inconsistency +// BIT(16): kDeviatingFFactor : The calculated overall F-Factor deviates too much from the mean - inconsistency // // * Set bits leading to not useable low-gain signal: // -// BIT(16): kConversionHiLoNotValid: The calibrated Conversion between Hi-Gain and Low Gain gives absurd results +// BIT(17): kConversionHiLoNotValid: The calibrated Conversion between Hi-Gain and Low Gain gives absurd results // // These bits can be called with the enum MBadPixelsPix::UncalibratedType_t in combination Index: /trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.h =================================================================== --- /trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.h (revision 4541) +++ /trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.h (revision 4542) @@ -45,7 +45,8 @@ kMeanTimeInLast2Bins = BIT(13), kDeviatingNumPhes = BIT(14), - kDeviatingFFactor = BIT(15), - kDeviatingTimeResolution = BIT(16), - kConversionHiLoNotValid = BIT(17) + kDeviatingNumPhots = BIT(15), + kDeviatingFFactor = BIT(16), + kDeviatingTimeResolution = BIT(17), + kConversionHiLoNotValid = BIT(18) }; Index: /trunk/MagicSoft/Mars/mcalib/CalibLinkDef.h =================================================================== --- /trunk/MagicSoft/Mars/mcalib/CalibLinkDef.h (revision 4541) +++ /trunk/MagicSoft/Mars/mcalib/CalibLinkDef.h (revision 4542) @@ -17,4 +17,5 @@ #pragma link C++ class MCalibrationQECam+; #pragma link C++ class MCalibrationQEPix+; +#pragma link C++ class MCalibrationTestCalc+; #pragma link C++ class MCalibrationChargeCalc+; #pragma link C++ class MCalibrationChargeCam+; Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc (revision 4541) +++ /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc (revision 4542) @@ -949,17 +949,17 @@ Float_t lowlim [nareas]; Float_t upplim [nareas]; - Float_t areavars [nareas]; - Float_t areaweights [nareas], sectorweights [nsectors]; - Float_t areaphes [nareas], sectorphes [nsectors]; + Double_t areavars [nareas]; + Double_t areaweights[nareas], sectorweights [nsectors]; + Double_t areaphes [nareas], sectorphes [nsectors]; Int_t numareavalid[nareas], numsectorvalid[nsectors]; memset(lowlim ,0, nareas * sizeof(Float_t)); memset(upplim ,0, nareas * sizeof(Float_t)); - memset(areaphes ,0, nareas * sizeof(Float_t)); - memset(areavars ,0, nareas * sizeof(Float_t)); - memset(areaweights ,0, nareas * sizeof(Float_t)); + memset(areaphes ,0, nareas * sizeof(Double_t)); + memset(areavars ,0, nareas * sizeof(Double_t)); + memset(areaweights ,0, nareas * sizeof(Double_t)); memset(numareavalid ,0, nareas * sizeof(Int_t )); - memset(sectorweights ,0, nsectors * sizeof(Float_t)); - memset(sectorphes ,0, nsectors * sizeof(Float_t)); + memset(sectorweights ,0, nsectors * sizeof(Double_t)); + memset(sectorphes ,0, nsectors * sizeof(Double_t)); memset(numsectorvalid,0, nsectors * sizeof(Int_t )); @@ -1066,6 +1066,6 @@ memset(numareavalid,0,nareas*sizeof(Int_t)); - memset(areaphes ,0,nareas*sizeof(Float_t)); - memset(areavars ,0,nareas*sizeof(Float_t)); + memset(areaphes ,0,nareas*sizeof(Double_t)); + memset(areavars ,0,nareas*sizeof(Double_t)); // @@ -1367,12 +1367,12 @@ Float_t lowlim [nareas]; Float_t upplim [nareas]; - Float_t avffactorphotons [nareas]; - Float_t avffactorphotvar [nareas]; + Double_t avffactorphotons [nareas]; + Double_t avffactorphotvar [nareas]; Int_t numffactor [nareas]; memset(lowlim ,0, nareas * sizeof(Float_t)); memset(upplim ,0, nareas * sizeof(Float_t)); - memset(avffactorphotons,0, nareas * sizeof(Float_t)); - memset(avffactorphotvar,0, nareas * sizeof(Float_t)); + memset(avffactorphotons,0, nareas * sizeof(Double_t)); + memset(avffactorphotvar,0, nareas * sizeof(Double_t)); memset(numffactor ,0, nareas * sizeof(Int_t)); Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.h =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.h (revision 4541) +++ /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.h (revision 4542) @@ -48,11 +48,11 @@ private: - static const Float_t fgChargeLimit; //! Default for fChargeLimit (now set to: 2.5) - static const Float_t fgChargeErrLimit; //! Default for fChargeErrLimit (now set to: 0.) - static const Float_t fgChargeRelErrLimit; //! Default for fChargeRelErrLimit (now set to: 1.) - static const Float_t fgLambdaCheckLimit; //! Default for fLambdaCheckLimit (now set to: 0.2) - static const Float_t fgLambdaErrLimit; //! Default for fLabmdaErrLimit (now set to: 0.5) - static const Float_t fgPheErrLimit; //! Default for fPheErrLimit (now set to: 4.) - static const Float_t fgFFactorErrLimit; //! Default for fFFactorErrLimit (now set to: 4.) + static const Float_t fgChargeLimit; //! Default for fChargeLimit (now set to: 2.5) + static const Float_t fgChargeErrLimit; //! Default for fChargeErrLimit (now set to: 0.) + static const Float_t fgChargeRelErrLimit; //! Default for fChargeRelErrLimit (now set to: 1.) + static const Float_t fgLambdaCheckLimit; //! Default for fLambdaCheckLimit (now set to: 0.2) + static const Float_t fgLambdaErrLimit; //! Default for fLabmdaErrLimit (now set to: 0.5) + static const Float_t fgPheErrLimit; //! Default for fPheErrLimit (now set to: 4.) + static const Float_t fgFFactorErrLimit; //! Default for fFFactorErrLimit (now set to: 4.) // Variables @@ -107,14 +107,19 @@ void PrintUncalibrated( MBadPixelsPix::UncalibratedType_t typ, const char *text) const; - void SetPheFitOK ( const Int_t aidx, const Bool_t b=kTRUE ) { b ? SETBIT(fResultFlags[aidx], kPheFitOK) - : CLRBIT(fResultFlags[aidx], kPheFitOK); } - void SetFFactorFitOK ( const Int_t aidx, const Bool_t b=kTRUE ) { b ? SETBIT(fResultFlags[aidx], kFFactorFitOK) - : CLRBIT(fResultFlags[aidx], kFFactorFitOK); } - void SetBlindPixelFitOK ( const Int_t idx, const Bool_t b=kTRUE ) { b ? SETBIT(fBlindPixelFlags[idx], kBlindPixelFitOK) - : CLRBIT(fBlindPixelFlags[idx], kBlindPixelFitOK); } - void SetBlindPixelPedFitOK( const Int_t idx, const Bool_t b=kTRUE ) { b ? SETBIT(fBlindPixelFlags[idx], kBlindPixelPedFitOK) - : CLRBIT(fBlindPixelFlags[idx], kBlindPixelPedFitOK); } - void SetPINDiodeFitOK ( const Int_t idx, const Bool_t b=kTRUE ) { b ? SETBIT(fPINDiodeFlags[idx], kPINDiodeFitOK) - : CLRBIT(fPINDiodeFlags[idx], kPINDiodeFitOK); } + void SetPheFitOK ( const Int_t aidx, const Bool_t b=kTRUE ) { + b ? SETBIT(fResultFlags[aidx], kPheFitOK) + : CLRBIT(fResultFlags[aidx], kPheFitOK); } + void SetFFactorFitOK ( const Int_t aidx, const Bool_t b=kTRUE ) { + b ? SETBIT(fResultFlags[aidx], kFFactorFitOK) + : CLRBIT(fResultFlags[aidx], kFFactorFitOK); } + void SetBlindPixelFitOK ( const Int_t idx, const Bool_t b=kTRUE ) { + b ? SETBIT(fBlindPixelFlags[idx], kBlindPixelFitOK) + : CLRBIT(fBlindPixelFlags[idx], kBlindPixelFitOK); } + void SetBlindPixelPedFitOK( const Int_t idx, const Bool_t b=kTRUE ) { + b ? SETBIT(fBlindPixelFlags[idx], kBlindPixelPedFitOK) + : CLRBIT(fBlindPixelFlags[idx], kBlindPixelPedFitOK); } + void SetPINDiodeFitOK ( const Int_t idx, const Bool_t b=kTRUE ) { + b ? SETBIT(fPINDiodeFlags[idx], kPINDiodeFitOK) + : CLRBIT(fPINDiodeFlags[idx], kPINDiodeFitOK); } Int_t PreProcess (MParList *pList); Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationTestCalc.cc =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibrationTestCalc.cc (revision 4542) +++ /trunk/MagicSoft/Mars/mcalib/MCalibrationTestCalc.cc (revision 4542) @@ -0,0 +1,477 @@ +/* ======================================================================== *\ +! +! * +! * This file is part of MARS, the MAGIC Analysis and Reconstruction +! * Software. It is distributed to you in the hope that it can be a useful +! * and timesaving tool in analysing Data of imaging Cerenkov telescopes. +! * It is distributed WITHOUT ANY WARRANTY. +! * +! * Permission to use, copy, modify and distribute this software and its +! * documentation for any purpose is hereby granted without fee, +! * provided that the above copyright notice appear in all copies and +! * that both that copyright notice and this permission notice appear +! * in supporting documentation. It is provided "as is" without express +! * or implied warranty. +! * +! +! +! Author(s): Markus Gaug 08/2004 +! +! Copyright: MAGIC Software Development, 2000-2004 +! +! +\* ======================================================================== */ + +////////////////////////////////////////////////////////////////////////////// +// +// MCalibrationTestCalc +// +// PreProcess(): Initialize pointers to MHCalibrationTestCam +// +// ReInit(): MCalibrationCam::InitSize(NumPixels) is called from MGeomApply (which allocates +// memory in a TClonesArray of type MCalibrationChargePix) +// Initializes pointer to MBadPixelsCam +// +// Process(): Nothing to be done, histograms getting filled by MHCalibrationTestCam +// +// PostProcess(): Print out interpolation results to file +// +// Input Containers: +// MHCalibrationTestCam +// MBadPixelsCam +// MGeomCam +// +// Output Containers: +// none +// +////////////////////////////////////////////////////////////////////////////// +#include "MCalibrationTestCalc.h" + +#include +#include +#include + +#include "MLog.h" +#include "MLogManip.h" + +#include "MParList.h" + +#include "MGeomCam.h" +#include "MGeomPix.h" +#include "MHCamera.h" + +#include "MHCalibrationTestCam.h" +#include "MHCalibrationTestPix.h" + +#include "MBadPixelsCam.h" +#include "MBadPixelsPix.h" + +ClassImp(MCalibrationTestCalc); + +using namespace std; + +const Float_t MCalibrationTestCalc::fgPhotErrLimit = 4.5; +// -------------------------------------------------------------------------- +// +// Default constructor. +// +// Sets the pointer to fTestCam and fGeom to NULL +// Sets outputpath to "." +// Sets outputfile to "TestCalibStat.txt" +// Sets fPhotErrLimit to fgPhotErrLimit +// +// Calls: +// - Clear() +// +MCalibrationTestCalc::MCalibrationTestCalc(const char *name, const char *title) + : fBadPixels(NULL), fTestCam(NULL), fGeom(NULL) +{ + + fName = name ? name : "MCalibrationTestCalc"; + fTitle = title ? title : "Task to output the results of MHCalibrationTestCam "; + + SetPhotErrLimit(); + + SetOutputPath(); + SetOutputFile(); + +} + + +// ----------------------------------------------------------------------------------- +// +// The following containers are searched and created if they were not found: +// +// - MBadPixelsCam +// +Int_t MCalibrationTestCalc::PreProcess(MParList *pList) +{ + + // + // Containers that are created in case that they are not there. + // + fBadPixels = (MBadPixelsCam*)pList->FindCreateObj("MBadPixelsCam"); + if (!fBadPixels) + { + *fLog << err << "Could not find or create MBadPixelsCam ... aborting." << endl; + return kFALSE; + } + + return kTRUE; +} + + +// -------------------------------------------------------------------------- +// +// Search for the following input containers and abort if not existing: +// - MGeomCam +// - MHCalibrationTestCam +// +// +Bool_t MCalibrationTestCalc::ReInit(MParList *pList ) +{ + + fGeom = (MGeomCam*)pList->FindObject("MGeomCam"); + if (!fGeom) + { + *fLog << err << "No MGeomCam found... aborting." << endl; + return kFALSE; + } + + fTestCam = (MHCalibrationTestCam*)pList->FindObject("MHCalibrationTestCam"); + if (!fTestCam) + { + *fLog << err << "Cannot find MHCalibrationTestCam... aborting" << endl; + *fLog << err << "Maybe you forget to call an MFillH for the MHCalibrationTestCam before..." << endl; + return kFALSE; + } + + + return kTRUE; +} + +// ---------------------------------------------------------------------------------- +// +// Nothing to be done in Process, but have a look at MHCalibrationTestCam, instead +// +Int_t MCalibrationTestCalc::Process() +{ + return kTRUE; +} + +// ----------------------------------------------------------------------- +// +// Return if number of executions is null. +// +// Print out some statistics +// +Int_t MCalibrationTestCalc::PostProcess() +{ + + if (GetNumExecutions()==0) + return kFALSE; + + // + // Re-direct the output to an ascii-file from now on: + // + MLog asciilog; + asciilog.SetOutputFile(GetOutputFile(),kTRUE); + SetLogStream(&asciilog); + // + // Finalize calibration statistics + // + FinalizeCalibratedPhotons(); + + *fLog << inf << endl; + *fLog << GetDescriptor() << ": Not interpolated pixels statistics:" << endl; + + PrintNotInterpolated(); + + SetLogStream(&gLog); + + return kTRUE; +} + + +// ------------------------------------------------------------------------ +// +// +// First loop: Calculate a mean and mean RMS of calibrated photons per area index +// Include only MHCalibrationTestPix's which are not empty (not interpolated) +// +// Second loop: Get weighted mean number of calibrated photons and its RMS +// excluding those deviating by more than fPhotErrLimit +// sigmas from the mean (obtained in first loop). Set +// MBadPixelsPix::kDeviatingNumPhots if excluded. +// +void MCalibrationTestCalc::FinalizeCalibratedPhotons() const +{ + + const UInt_t npixels = fGeom->GetNumPixels(); + const UInt_t nareas = fGeom->GetNumAreas(); + const UInt_t nsectors = fGeom->GetNumSectors(); + + Double_t lowlim [nareas]; + Double_t upplim [nareas]; + Double_t areaphotons [nareas], sectorphotons [nsectors]; + Double_t areavars [nareas], sectorvars [nsectors]; + Double_t fittedmean [nareas], fittedsigma [nareas]; + Int_t numareavalid[nareas], numsectorvalid[nsectors]; + + memset(lowlim ,0, nareas * sizeof(Double_t)); + memset(upplim ,0, nareas * sizeof(Double_t)); + memset(fittedmean ,0, nareas * sizeof(Double_t)); + memset(fittedsigma ,0, nareas * sizeof(Double_t)); + memset(areaphotons ,0, nareas * sizeof(Double_t)); + memset(areavars ,0, nareas * sizeof(Double_t)); + memset(numareavalid ,0, nareas * sizeof(Int_t )); + memset(sectorphotons ,0, nsectors * sizeof(Double_t)); + memset(sectorvars ,0, nsectors * sizeof(Double_t)); + memset(numsectorvalid,0, nsectors * sizeof(Int_t )); + + // + // First loop: Get mean number of calibrated photons and the RMS + // The loop is only to recognize later pixels with very deviating numbers + // + MHCamera camphotons(*fGeom,"Camphotons","Photons in Camera"); + + for (UInt_t i=0; iFit("gaus","Q"); + const Double_t mean = hist->GetFunction("gaus")->GetParameter(1); + const Double_t sigma = hist->GetFunction("gaus")->GetParameter(2); + const Int_t ndf = hist->GetFunction("gaus")->GetNDF(); + + if (ndf < 2) + { + *fLog << warn << GetDescriptor() << ": Cannot use a Gauss fit to the number of calibrated photons " + << "in the camera with area index: " << aidx << endl; + *fLog << warn << GetDescriptor() << ": Number of dof.: " << ndf << " is smaller than 2 " << endl; + *fLog << warn << GetDescriptor() << ": Will use the simple mean and rms " << endl; + delete hist; + continue; + } + + const Double_t prob = hist->GetFunction("gaus")->GetProb(); + + if (prob < 0.001) + { + *fLog << warn << GetDescriptor() << ": Cannot use a Gauss fit to the number of calibrated photons " + << "in the camera with area index: " << aidx << endl; + *fLog << warn << GetDescriptor() << ": Fit probability " << prob + << " is smaller than 0.001 " << endl; + *fLog << warn << GetDescriptor() << ": Will use the simple mean and rms " << endl; + delete hist; + continue; + } + + fittedmean [aidx] = mean; + fittedsigma[aidx] = sigma; + + lowlim [aidx] = mean - fPhotErrLimit*sigma; + upplim [aidx] = mean + fPhotErrLimit*sigma; + + *fLog << " Fitted number of photons in area index " << aidx + << ": " << Form("%6.2f +- %6.2f",fittedmean[aidx],fittedsigma[aidx]) << endl; + + delete hist; + } + + memset(numareavalid,0,nareas*sizeof(Int_t)); + memset(areaphotons ,0,nareas*sizeof(Double_t)); + memset(areavars ,0,nareas*sizeof(Double_t)); + + // + // Second loop: Get mean number of calibrated photons and its RMS excluding + // pixels deviating by more than fPhotErrLimit sigma. + // + for (UInt_t i=0; i upplim[aidx] ) + { + *fLog << warn << "Deviating number of calibrated photons: " + << Form("%4.2f",nphot) << " out of accepted limits: [" + << Form("%4.2f%s%4.2f",lowlim[aidx],",",upplim[aidx]) << "] in pixel " << i << endl; + bad.SetUncalibrated( MBadPixelsPix::kDeviatingNumPhots ); + bad.SetUnsuitable ( MBadPixelsPix::kUnsuitableRun ); + continue; + } + + areavars [aidx] += nphot*nphot/area/area; + areaphotons [aidx] += nphot/area; + numareavalid [aidx] ++; + + sectorvars [sector] += nphot*nphot/area/area; + sectorphotons [sector] += nphot/area; + numsectorvalid[sector] ++; + } + + for (UInt_t aidx=0; aidxGetNotInterpolateablePixels(); + const Int_t areas = fGeom->GetNumAreas(); + + TArrayI *newarr[areas]; + + for (Int_t aidx=0; aidxGetSize(); + newarr[aidx]->Set(size+1); + newarr[aidx]->AddAt(id,size); + numtot[aidx]++; + } + + Int_t num = 0; + + for (Int_t aidx = 0; aidxGetSize(); i++) + { + *fLog << newarr[aidx]->At(i) << " "; + num++; + } + *fLog << endl; + } + + + *fLog << " " << setw(7) << num << " total not interpolateable pixels " << endl; + +} + +// -------------------------------------------------------------------------- +// +// Set the path for output file +// +void MCalibrationTestCalc::SetOutputPath(TString path) +{ + fOutputPath = path; + if (fOutputPath.EndsWith("/")) + fOutputPath = fOutputPath(0, fOutputPath.Length()-1); +} + +void MCalibrationTestCalc::SetOutputFile(TString file) +{ + fOutputFile = file; +} + +// -------------------------------------------------------------------------- +// +// Get the output file +// +const char* MCalibrationTestCalc::GetOutputFile() +{ + return Form("%s/%s", (const char*)fOutputPath, (const char*)fOutputFile); +} Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationTestCalc.h =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibrationTestCalc.h (revision 4542) +++ /trunk/MagicSoft/Mars/mcalib/MCalibrationTestCalc.h (revision 4542) @@ -0,0 +1,60 @@ +#ifndef MARS_MCalibrationTestCalc +#define MARS_MCalibrationTestCalc + +///////////////////////////////////////////////////////////////////////////// +// // +// MCalibrationTestCalc // +// // +// Integrates the time slices of the all pixels of a calibration event // +// and substract the pedestal value // +// // +///////////////////////////////////////////////////////////////////////////// + +#ifndef MARS_MTask +#include "MTask.h" +#endif + +class MHCalibrationTestCam; +class MBadPixelsCam; +class MGeomCam; +class MCalibrationTestCalc : public MTask +{ +private: + + static const Float_t fgPhotErrLimit; //! Default for fPhotErrLimit (now set to: 4.) + + // Variables + Float_t fPhotErrLimit; // Limit acceptance nr. cal. phots w.r.t. area idx mean (in sigmas) + + TString fOutputPath; // Path to the output file + TString fOutputFile; // Name of the output file + + // Pointers + MBadPixelsCam *fBadPixels; //! Bad Pixels + MHCalibrationTestCam *fTestCam; //! Calibrated Photons in the camera + MGeomCam *fGeom; //! Camera geometry + + // functions + const char* GetOutputFile(); + + void PrintNotInterpolated() const; + void FinalizeCalibratedPhotons() const; + + Int_t PreProcess (MParList *pList); + Bool_t ReInit (MParList *pList); + Int_t Process (); + Int_t PostProcess(); + +public: + + MCalibrationTestCalc(const char *name=NULL, const char *title=NULL); + + void SetOutputPath ( TString path="." ); + void SetOutputFile ( TString file="TestCalibStat.txt" ); + + void SetPhotErrLimit ( const Float_t f=fgPhotErrLimit ) { fPhotErrLimit = f; } + + ClassDef(MCalibrationTestCalc, 1) // Task retrieving the results of MHCalibrationTestCam +}; + +#endif Index: /trunk/MagicSoft/Mars/mcalib/MHCalibrationTestCam.cc =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MHCalibrationTestCam.cc (revision 4541) +++ /trunk/MagicSoft/Mars/mcalib/MHCalibrationTestCam.cc (revision 4542) @@ -116,4 +116,6 @@ SetAverageNbins(5000); + + fNotInterpolateablePixels.Set(0); } @@ -376,5 +378,7 @@ if (hist.IsEmpty()) { - *fLog << warn << GetDescriptor() << ": WARNING: Not interpolated histogram pixel: " << i << endl; + const Int_t size = fNotInterpolateablePixels.GetSize(); + fNotInterpolateablePixels.Set(size+1); + fNotInterpolateablePixels[size] = i; continue; } @@ -441,14 +445,4 @@ } -// -------------------------------------------------------------------------- -// -// Sets all pixels to MBadPixelsPix::kUnreliableRun, if following flags are set: -// - MBadPixelsPix::kTestNotFitted -// - MBadPixelsPix::kTestOscillating -// -void MHCalibrationTestCam::FinalizeBadPixels() -{ - -} // -------------------------------------------------------------------------- Index: /trunk/MagicSoft/Mars/mcalib/MHCalibrationTestCam.h =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MHCalibrationTestCam.h (revision 4541) +++ /trunk/MagicSoft/Mars/mcalib/MHCalibrationTestCam.h (revision 4542) @@ -7,4 +7,7 @@ #ifndef ROOT_TArrayF #include "TArrayF.h" +#endif +#ifndef ROOT_TArrayI +#include "TArrayI.h" #endif @@ -19,9 +22,10 @@ TArrayF fMeanSigmaPhotPerArea; TArrayF fRmsSigmaPhotPerArea ; + + TArrayI fNotInterpolateablePixels; Bool_t ReInitHists(MParList *pList); Bool_t FillHists(const MParContainer *par, const Stat_t w=1); Bool_t FinalizeHists(); - void FinalizeBadPixels(); public: @@ -33,12 +37,14 @@ void DrawPixelContent(Int_t idx) const; - const Float_t GetMeanMeanPhotPerArea ( const Int_t aidx ) const { return fMeanMeanPhotPerArea [aidx]; } - const Float_t GetRmsMeanPhotPerArea ( const Int_t aidx ) const { return fRmsMeanPhotPerArea [aidx]; } - const Float_t GetMeanSigmaPhotPerArea ( const Int_t aidx ) const { return fMeanSigmaPhotPerArea [aidx]; } - const Float_t GetRmsSigmaPhotPerArea ( const Int_t aidx ) const { return fRmsSigmaPhotPerArea [aidx]; } + const Float_t GetMeanMeanPhotPerArea ( const Int_t aidx ) const { return fMeanMeanPhotPerArea [aidx]; } + const Float_t GetMeanSigmaPhotPerArea ( const Int_t aidx ) const { return fMeanSigmaPhotPerArea [aidx]; } + const Float_t GetRmsMeanPhotPerArea ( const Int_t aidx ) const { return fRmsMeanPhotPerArea [aidx]; } + const Float_t GetRmsSigmaPhotPerArea ( const Int_t aidx ) const { return fRmsSigmaPhotPerArea [aidx]; } + const TArrayI &GetNotInterpolateablePixels () const { return fNotInterpolateablePixels; } + void CalcAverageSigma(); - ClassDef(MHCalibrationTestCam, 0) // Histogram class for Relative Time Camera Calibration + ClassDef(MHCalibrationTestCam, 1) // Histogram class for Relative Time Camera Calibration }; Index: /trunk/MagicSoft/Mars/mcalib/Makefile =================================================================== --- /trunk/MagicSoft/Mars/mcalib/Makefile (revision 4541) +++ /trunk/MagicSoft/Mars/mcalib/Makefile (revision 4542) @@ -42,4 +42,5 @@ MCalibrationQEPix.cc \ MCalibrationPedCam.cc \ + MCalibrationTestCalc.cc \ MCalibrationChargeCalc.cc \ MCalibrationChargeCam.cc \ Index: /trunk/MagicSoft/Mars/mjobs/MJExtractCalibTest.cc =================================================================== --- /trunk/MagicSoft/Mars/mjobs/MJExtractCalibTest.cc (revision 4541) +++ /trunk/MagicSoft/Mars/mjobs/MJExtractCalibTest.cc (revision 4542) @@ -53,4 +53,5 @@ #include "MCalibrationRelTimeCam.h" #include "MCalibrationQECam.h" +#include "MCalibrationTestCalc.h" #include "MHCamEvent.h" @@ -262,4 +263,7 @@ badtreat.SetUseInterpolation(); badtreat.SetSloppyTreatment(); + MCalibrationTestCalc testcalc; + testcalc.SetOutputPath(fOutputPath); + testcalc.SetOutputFile(Form("%s-TestCalibStat.txt",(const char*)fRuns->GetRunsAsFileName())); MHCamEvent evt("ExtSignal"); @@ -294,4 +298,5 @@ tlist.AddToList(&badtreat); tlist.AddToList(&fillcam); + tlist.AddToList(&testcalc); // Create and setup the eventloop