Index: trunk/MagicSoft/Mars/mcalib/CalibLinkDef.h =================================================================== --- trunk/MagicSoft/Mars/mcalib/CalibLinkDef.h (revision 5729) +++ trunk/MagicSoft/Mars/mcalib/CalibLinkDef.h (revision 5749) @@ -18,4 +18,5 @@ #pragma link C++ class MCalibrationIntensityRelTimeCam+; #pragma link C++ class MCalibrationIntensityTestCam+; +#pragma link C++ class MCalibrationIntensityHiLoCam+; #pragma link C++ class MCalibrationCam+; #pragma link C++ class MCalibrationPix+; @@ -24,4 +25,6 @@ #pragma link C++ class MCalibrationRelTimePix+; #pragma link C++ class MCalibrationPedCam+; +#pragma link C++ class MCalibrationHiLoCam+; +#pragma link C++ class MCalibrationHiLoPix+; #pragma link C++ class MCalibrationQECamMagic+; #pragma link C++ class MCalibrationQECam+; Index: trunk/MagicSoft/Mars/mcalib/MCalibrationHiLoCam.cc =================================================================== --- trunk/MagicSoft/Mars/mcalib/MCalibrationHiLoCam.cc (revision 5749) +++ trunk/MagicSoft/Mars/mcalib/MCalibrationHiLoCam.cc (revision 5749) @@ -0,0 +1,256 @@ +/* ======================================================================== *\ +! +! * +! * 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 11/2003 +! +! Copyright: MAGIC Software Development, 2000-2004 +! +! +\* ======================================================================== */ + +///////////////////////////////////////////////////////////////////////////// +// +// MCalibrationHiLoCam +// +// Storage container for ratio between higain and logain charge extraction +// calibration results of the whole camera. +// +// Individual pixels have to be cast when retrieved e.g.: +// MCalibrationHiLoPix &avpix = (MCalibrationHiLoPix&)(*fHiLoCam)[i] +// +// The following "calibration" constants can be retrieved from each pixel: +// - GetHiLoRatio(): The mean signal ratio between high-gain and low-gain +// - GetHiLoRatioErr(): The Gauss sigma of histogrammed signal ratios +// +// Averaged values over one whole area index (e.g. inner or outer pixels for +// the MAGIC camera), can be retrieved via: +// MCalibrationHiLoPix &avpix = (MCalibrationHiLoPix&)fRelCam->GetAverageArea(i) +// +// Averaged values over one whole camera sector can be retrieved via: +// MCalibrationHiLoPix &avpix = (MCalibrationHiLoPix&)fRelCam->GetAverageSector(i) +// +// Note the averageing has been done on an event-by-event basis. Resulting +// Sigma's of the Gauss fit have been multiplied with the square root of the number +// of involved pixels in order to make a direct comparison possible with the mean of +// sigmas. +// +// See also: MHCalibrationHiLoPix, MHCalibrationHiLoCam +// +// The calculated values (types of GetPixelContent) are: +// +// Fitted values: +// ============== +// +// 0: HiLo Ratio +// 1: Error of HiLo Ratio +// 2: Sigma of HiLo Ratio == Resolution +// 3: Error of Sigma of HiLo Ratio +// +// Useful variables derived from the fit results: +// ============================================= +// +// 4: Returned probability of Gauss fit to distribution +// +///////////////////////////////////////////////////////////////////////////// +#include "MCalibrationHiLoCam.h" +#include "MCalibrationCam.h" + +#include + +#include "MLog.h" +#include "MLogManip.h" + +#include "MGeomCam.h" +#include "MGeomPix.h" + +#include "MCalibrationHiLoPix.h" + +ClassImp(MCalibrationHiLoCam); + +using namespace std; + +// -------------------------------------------------------------------------- +// +// Default constructor. +// +MCalibrationHiLoCam::MCalibrationHiLoCam(const char *name, const char *title) +{ + + fName = name ? name : "MCalibrationHiLoCam"; + fTitle = title ? title : "Container for High Gain vs. Low Gain amplification ratio"; + +} + +void MCalibrationHiLoCam::Add(const UInt_t a, const UInt_t b) +{ + for (UInt_t i=a; iAddAt(new MCalibrationHiLoPix,i); +} + + +void MCalibrationHiLoCam::AddArea(const UInt_t a, const UInt_t b) +{ + for (UInt_t i=a; iAddAt(new MCalibrationHiLoPix,i); +} + +void MCalibrationHiLoCam::AddSector(const UInt_t a, const UInt_t b) +{ + for (UInt_t i=a; iAddAt(new MCalibrationHiLoPix,i); +} + +// -------------------------------------------------------------------------- +// +// Print first the well fitted pixels +// and then the ones which are not Valid +// +void MCalibrationHiLoCam::Print(Option_t *o) const +{ + + *fLog << all << GetDescriptor() << ":" << endl; + int id = 0; + + *fLog << all << "Calibrated pixels:" << endl; + *fLog << all << endl; + + TIter Next(fPixels); + MCalibrationHiLoPix *pix; + while ((pix=(MCalibrationHiLoPix*)Next())) + { + + if (!pix->IsExcluded()) + { + + *fLog << all + << Form("%s%4i%s%4.2f%s%4.2f%s%4.2f%s%4.2f","Pix ",pix->GetPixId(), + ": Ratio: ",pix->GetHiLoRatio()," +- ",pix->GetHiLoRatioErr(), + " Sigma: ",pix->GetHiLoSigma()," +- ",pix->GetHiLoSigmaErr()) + << endl; + id++; + } + } + + *fLog << all << id << " pixels" << endl; + id = 0; + + + *fLog << all << endl; + *fLog << all << "Excluded pixels:" << endl; + *fLog << all << endl; + + id = 0; + + TIter Next4(fPixels); + while ((pix=(MCalibrationHiLoPix*)Next4())) + { + if (pix->IsExcluded()) + { + *fLog << all << pix->GetPixId() << endl; + id++; + } + } + *fLog << all << id << " Excluded pixels " << endl; + *fLog << endl; + + TIter Next5(fAverageAreas); + while ((pix=(MCalibrationHiLoPix*)Next5())) + { + *fLog << all + << Form("%s%4i%s%4.2f%s%4.2f%s%4.2f%s%4.2f","Average Area ",pix->GetPixId(), + ": Ratio: ",pix->GetHiLoRatio()," +- ",pix->GetHiLoRatioErr(), + " Sigma: ",pix->GetHiLoSigma()," +- ",pix->GetHiLoSigmaErr()) + << endl; + } + + TIter Next6(fAverageSectors); + while ((pix=(MCalibrationHiLoPix*)Next5())) + { + *fLog << all + << Form("%s%4i%s%4.2f%s%4.2f%s%4.2f%s%4.2f","Average Sector ",pix->GetPixId(), + ": Ratio: ",pix->GetHiLoRatio()," +- ",pix->GetHiLoRatioErr(), + " Sigma: ",pix->GetHiLoSigma()," +- ",pix->GetHiLoSigmaErr()) + << endl; + } +} + + +// -------------------------------------------------------------------------- +// +// The types are as follows: +// +// Fitted values: +// ============== +// +// 0: Fitted HiLo +// 1: Error of fitted HiLo +// 2: Sigma of fitted HiLo +// 3: Error of Sigma of fitted HiLo +// +// Useful variables derived from the fit results: +// ============================================= +// +// 4: Returned probability of Gauss fit to HiLo distribution +// +Bool_t MCalibrationHiLoCam::GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type) const +{ + + if (idx > GetSize()) + return kFALSE; + + Float_t area = cam[idx].GetA(); + + if (area == 0) + return kFALSE; + + MCalibrationHiLoPix &pix = (MCalibrationHiLoPix&)(*this)[idx]; + + switch (type) + { + case 0: + if (pix.IsExcluded()) + return kFALSE; + val = pix.GetMean(); + break; + case 1: + if (pix.IsExcluded()) + return kFALSE; + val = pix.GetMeanErr(); + break; + case 2: + if (pix.IsExcluded()) + return kFALSE; + val = pix.GetSigma(); + break; + case 3: + if (pix.IsExcluded()) + return kFALSE; + val = pix.GetSigmaErr(); + break; + case 4: + if (pix.IsExcluded()) + return kFALSE; + val = pix.GetProb(); + break; + default: + return kFALSE; + } + + return val!=-1.; + +} + Index: trunk/MagicSoft/Mars/mcalib/MCalibrationHiLoCam.h =================================================================== --- trunk/MagicSoft/Mars/mcalib/MCalibrationHiLoCam.h (revision 5749) +++ trunk/MagicSoft/Mars/mcalib/MCalibrationHiLoCam.h (revision 5749) @@ -0,0 +1,29 @@ +#ifndef MARS_MCalibrationHiLoCam +#define MARS_MCalibrationHiLoCam + +#ifndef MARS_MCalibrationCam +#include "MCalibrationCam.h" +#endif + +class MCalibrationHiLoCam : public MCalibrationCam +{ +private: + + void Add(const UInt_t a, const UInt_t b); + void AddArea(const UInt_t a, const UInt_t b); + void AddSector(const UInt_t a, const UInt_t b); + +public: + + MCalibrationHiLoCam(const char *name=NULL, const char *title=NULL); + + // Prints + void Print(Option_t *o="") const; + + // Others + Bool_t GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type=0) const; + + ClassDef(MCalibrationHiLoCam, 1) // Container Rel. Arrival Time Calibration Results Camera +}; + +#endif Index: trunk/MagicSoft/Mars/mcalib/MCalibrationHiLoPix.cc =================================================================== --- trunk/MagicSoft/Mars/mcalib/MCalibrationHiLoPix.cc (revision 5749) +++ trunk/MagicSoft/Mars/mcalib/MCalibrationHiLoPix.cc (revision 5749) @@ -0,0 +1,54 @@ +/* ======================================================================== *\ +! +! * +! * 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 02/2004 +! +! Copyright: MAGIC Software Development, 2000-2004 +! +\* ======================================================================== */ +///////////////////////////////////////////////////////////////////////////// +// // +// MCalibrationHiLoPix // +// // +// Storage container for high-gain vs. low-gain charge calibration results // +// of one Pixel (PMT). // +// The following "calibration" constants can be retrieved: // +// - GetHiLoRatio(): The mean conversion High-gain vs. Low-gain +// with which the low-gain result has to be multiplied +// - GetHiLoSigma(): The Gauss sigma of histogrammed High-gain vs. Low-gain ratios +// +// See also: MHCalibrationHiLoPix, MHCalibrationHiLoCam // +// // +///////////////////////////////////////////////////////////////////////////// +#include "MCalibrationHiLoPix.h" + +ClassImp(MCalibrationHiLoPix); + +using namespace std; + +// -------------------------------------------------------------------------- +// +// Default Constructor +// +MCalibrationHiLoPix::MCalibrationHiLoPix(const char *name, const char *title) +{ + + fName = name ? name : "MCalibrationHiLoPix"; + fTitle = title ? title : "Results of MHCalibrationHiLoPix "; + +} + Index: trunk/MagicSoft/Mars/mcalib/MCalibrationHiLoPix.h =================================================================== --- trunk/MagicSoft/Mars/mcalib/MCalibrationHiLoPix.h (revision 5749) +++ trunk/MagicSoft/Mars/mcalib/MCalibrationHiLoPix.h (revision 5749) @@ -0,0 +1,26 @@ +#ifndef MARS_MCalibrationHiLoPix +#define MARS_MCalibrationHiLoPix + +#ifndef MARS_MCalibrationPix +#include "MCalibrationPix.h" +#endif + +class MCalibrationHiLoPix : public MCalibrationPix +{ +private: + +public: + + MCalibrationHiLoPix(const char *name=NULL, const char *title=NULL); + ~MCalibrationHiLoPix() {} + + Float_t GetHiLoRatio() const { return GetMean(); } + Float_t GetHiLoRatioErr() const { return GetMeanErr(); } + Float_t GetHiLoSigma() const { return GetSigma(); } + Float_t GetHiLoSigmaErr() const { return GetSigmaErr(); } + + ClassDef(MCalibrationHiLoPix, 1) // Container HiLo conversion Calibration Results Pixel +}; + +#endif + Index: trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityHiLoCam.cc =================================================================== --- trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityHiLoCam.cc (revision 5749) +++ trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityHiLoCam.cc (revision 5749) @@ -0,0 +1,252 @@ +/* ======================================================================== *\ +! +! * +! * 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 11/2003 +! +! Copyright: MAGIC Software Development, 2000-2004 +! +! +\* ======================================================================== */ +///////////////////////////////////////////////////////////////////////////// +// +// MCalibrationIntensityHiLoCam +// +// Storage container for intensity charge calibration results. +// +// Individual MCalibrationHiLoCam's can be retrieved with: +// - GetCam() yielding the current cam. +// - GetCam("name") yielding the current camera with name "name". +// - GetCam(i) yielding the i-th camera. +// +// See also: MCalibrationIntensityCam, MCalibrationHiLoCam, +// MCalibrationHiLoPix, MCalibrationHiLoCalc, MCalibrationQECam +// MHCalibrationHiLoPix, MHCalibrationHiLoCam +// +///////////////////////////////////////////////////////////////////////////// +#include "MCalibrationIntensityHiLoCam.h" +#include "MCalibrationHiLoCam.h" +#include "MCalibrationChargeCam.h" +#include "MCalibrationHiLoPix.h" +#include "MCalibrationChargePix.h" + +#include "MGeomCam.h" +#include "MGeomPix.h" + +#include "MLogManip.h" + +#include +#include + +ClassImp(MCalibrationIntensityHiLoCam); + +using namespace std; + +// -------------------------------------------------------------------------- +// +// Default constructor. +// +MCalibrationIntensityHiLoCam::MCalibrationIntensityHiLoCam(const char *name, const char *title) +{ + + fName = name ? name : "MCalibrationIntensityHiLoCam"; + fTitle = title ? title : "Results of the Intensity Calibration"; + + InitSize(1); +} + +// ------------------------------------------------------------------- +// +// Add MCalibrationHiLoCam's in the ranges from - to. +// +void MCalibrationIntensityHiLoCam::Add(const UInt_t from, const UInt_t to) +{ + for (UInt_t i=from; iAddAt(new MCalibrationHiLoCam,i); +} + +TGraphErrors *MCalibrationIntensityHiLoCam::GetHiLoRatioVsCharge( const UInt_t pixid, const MCalibrationIntensityChargeCam &chargecam, + const MCalibrationCam::PulserColor_t col) +{ + + if (chargecam.GetSize() != GetSize()) + { + *fLog << err << GetDescriptor() << ": Size mismatch between MCalibrationIntensityHiLoCam " + << "and MCalibrationIntensityChargeCam. " << endl; + return NULL; + } + + Int_t size = CountNumEntries(col); + + if (size == 0) + return NULL; + + if (size != chargecam.CountNumEntries(col)) + { + *fLog << err << GetDescriptor() << ": Size mismatch in colour between MCalibrationIntensityHiLoCam " + << "and MCalibrationIntensityChargeCam. " << endl; + return NULL; + } + + const Int_t nvalid = chargecam.CountNumValidEntries(pixid,col); + + if (nvalid == 0) + { + *fLog << err << GetDescriptor() << ": Only un-calibrated events in pixel: " << pixid << endl; + return NULL; + } + + TArrayF ratio(nvalid); + TArrayF ratioerr(nvalid); + TArrayF sig(nvalid); + TArrayF sigerr(nvalid); + + Int_t cnt = 0; + + for (Int_t i=0;iGetPulserColor() != col) + continue; + // + // Get the calibration pix from the calibration cam + // + MCalibrationChargePix &pix = (MCalibrationChargePix&)(*cam)[pixid]; + MCalibrationHiLoPix &relpix = (MCalibrationHiLoPix&)(*hilocam)[pixid]; + // + // Don't use bad pixels + // + if (!pix.IsFFactorMethodValid()) + continue; + // + ratio[cnt] = relpix.GetHiLoRatio(); + ratioerr[cnt] = relpix.GetHiLoRatioErr(); + // + sig [cnt] = pix.GetPheFFactorMethod(); + sigerr[cnt] = pix.GetPheFFactorMethodErr(); + cnt++; + } + + TGraphErrors *gr = new TGraphErrors(nvalid, + sig.GetArray(),ratio.GetArray(), + sigerr.GetArray(),ratioerr.GetArray()); + gr->SetTitle(Form("%s%3i","Pixel ",pixid)); + gr->GetXaxis()->SetTitle(" [1]"); + gr->GetYaxis()->SetTitle("HiLo Ratio [1]"); + return gr; +} + + +TGraphErrors *MCalibrationIntensityHiLoCam::GetHiLoRatioVsChargePerArea( const Int_t aidx,const MCalibrationIntensityChargeCam &chargecam, const MGeomCam &geom, const MCalibrationCam::PulserColor_t col) +{ + + Int_t size = CountNumEntries(col); + + if (size == 0) + return NULL; + + if (size != chargecam.CountNumEntries(col)) + { + *fLog << err << GetDescriptor() << ": Size mismatch in colour between MCalibrationIntensityHiLoCam " + << "and MCalibrationIntensityChargeCam. " << endl; + return NULL; + } + + TArrayF ratio(size); + TArrayF ratioerr(size); + TArrayF sig(size); + TArrayF sigerr(size); + + Int_t cnt = 0; + + for (Int_t i=0;iGetPulserColor() != col) + continue; + + const MCalibrationChargePix &apix = (MCalibrationChargePix&)cam->GetAverageArea(aidx); + const Float_t phe = apix.GetPheFFactorMethod(); + const Float_t pheerr = apix.GetPheFFactorMethodErr(); + + sig[cnt] = phe; + sigerr[cnt] = pheerr; + + Double_t ratiool = 0.; + Double_t ratiool2 = 0.; + Double_t var = 0.; + Int_t num = 0; + // + // Get the area calibration pix from the calibration cam + // + for (Int_t i=0; iGetSize(); i++) + { + const MCalibrationChargePix &pix = (MCalibrationChargePix&)(*cam)[i]; + const MCalibrationHiLoPix &relpix = (MCalibrationHiLoPix&)(*hilocam)[i]; + // + // Don't use bad pixels + // + if (!pix.IsFFactorMethodValid()) + continue; + // + // + if (aidx != geom[i].GetAidx()) + continue; + + ratiool += relpix.GetHiLoRatio(); + ratiool2 += relpix.GetHiLoRatio()*relpix.GetHiLoRatio(); + num++; + } + + if (num > 1) + { + ratiool /= num; + var = (ratiool2 - ratiool*ratiool*num) / (num-1); + + ratio[cnt] = ratiool; + if (var > 0.) + ratioerr[cnt] = TMath::Sqrt(var); + else + ratioerr[cnt] = 0.; + } + else + { + ratio[cnt] = -1.; + ratioerr[cnt] = 0.; + } + cnt++; + } + + TGraphErrors *gr = new TGraphErrors(size, + sig.GetArray(),ratio.GetArray(), + sigerr.GetArray(),ratioerr.GetArray()); + gr->SetTitle(Form("%s%3i","Area Index ",aidx)); + gr->GetXaxis()->SetTitle(" [1]"); + gr->GetYaxis()->SetTitle("HiLo Ratio [1]"); + return gr; +} Index: trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityHiLoCam.h =================================================================== --- trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityHiLoCam.h (revision 5749) +++ trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityHiLoCam.h (revision 5749) @@ -0,0 +1,32 @@ +#ifndef MARS_MCalibrationIntensityHiLoCam +#define MARS_MCalibrationIntensityHiLoCam + +#ifndef MARS_MCalibrationIntensityCam +#include "MCalibrationIntensityCam.h" +#endif + +#ifndef MARS_MCalibrationIntensityChargeCam +#include "MCalibrationIntensityChargeCam.h" +#endif + +class TGraphErrors; +class MCalibrationIntensityHiLoCam : public MCalibrationIntensityCam +{ +private: + + void Add(const UInt_t from, const UInt_t to); + +public: + + MCalibrationIntensityHiLoCam(const char *name=NULL, const char *title=NULL); + + TGraphErrors *GetHiLoRatioVsCharge( const UInt_t pixid, const MCalibrationIntensityChargeCam &chargecam, + const MCalibrationCam::PulserColor_t col=MCalibrationCam::kNONE); + TGraphErrors *GetHiLoRatioVsChargePerArea( const Int_t aidx, const MCalibrationIntensityChargeCam &chargecam, + const MGeomCam &geom, + const MCalibrationCam::PulserColor_t col=MCalibrationCam::kNONE); + + ClassDef(MCalibrationIntensityHiLoCam, 1) // Container Intensity HiLo Calibration Results Camera +}; + +#endif Index: trunk/MagicSoft/Mars/mcalib/Makefile =================================================================== --- trunk/MagicSoft/Mars/mcalib/Makefile (revision 5729) +++ trunk/MagicSoft/Mars/mcalib/Makefile (revision 5749) @@ -42,4 +42,5 @@ MCalibrationIntensityRelTimeCam.cc \ MCalibrationIntensityTestCam.cc \ + MCalibrationIntensityHiLoCam.cc \ MCalibrationCam.cc \ MCalibrationPix.cc \ @@ -54,4 +55,6 @@ MCalibrationTestCam.cc \ MCalibrationTestPix.cc \ + MCalibrationHiLoCam.cc \ + MCalibrationHiLoPix.cc \ MCalibrationChargeCalc.cc \ MCalibrationChargeCam.cc \