Index: /trunk/MagicSoft/Mars/mcalib/MHCalibrationCam.cc =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MHCalibrationCam.cc (revision 3630) +++ /trunk/MagicSoft/Mars/mcalib/MHCalibrationCam.cc (revision 3631) @@ -38,6 +38,6 @@ // The corresponding operators: [],() and the operators GetAverageHiGainArea(), // GetAverageLoGainArea(), GetAverageHiGainSector() and GetAverageLoGainSector() -// have to cast to the corresponding class. It is assumed that all classes dealing -// with calibration pixels derive from MHGausEvents +// have to be cast to the corresponding class. It is assumed that all classes +// dealing with calibration pixels derive from MHGausEvents. // ///////////////////////////////////////////////////////////////////////////// @@ -56,5 +56,4 @@ #include "MGeomCam.h" -#include "MGeomPix.h" ClassImp(MHCalibrationCam); @@ -62,5 +61,5 @@ using namespace std; -const Int_t MHCalibrationCam::fgPulserFrequency = 500; +const Int_t MHCalibrationCam::fgPulserFrequency = 500; // -------------------------------------------------------------------------- // Index: /trunk/MagicSoft/Mars/mcalib/MHCalibrationCam.h =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MHCalibrationCam.h (revision 3630) +++ /trunk/MagicSoft/Mars/mcalib/MHCalibrationCam.h (revision 3631) @@ -30,5 +30,5 @@ protected: - static const Int_t fgPulserFrequency; // The default for fPulserFrequency + static const Int_t fgPulserFrequency; // The default for fPulserFrequency (now set to: 500) Int_t fPulserFrequency; // Light pulser frequency @@ -86,5 +86,5 @@ virtual void DrawPixelContent( Int_t num ) const; - ClassDef(MHCalibrationCam, 1) // Base Histogram class for camera calibration + ClassDef(MHCalibrationCam, 1) // Base Histogram class for Calibration Camera }; Index: /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc (revision 3630) +++ /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc (revision 3631) @@ -29,16 +29,18 @@ // MHCalibrationChargeHiGainPix and MHCalibrationChargeLoGainPix for every: // -// - pixel, stored in the TObjArray's fHiGainArray and fLoGainArray +// - pixel, stored in the TObjArray's MHCalibrationCam::fHiGainArray and +// MHCalibrationCam::fLoGainArray // // - average pixel per area index (e.g. inner and outer for the MAGIC camera), -// stored in the TObjArray's fAverageHiGainAreas and fAverageLoGainAreas +// stored in the TObjArray's MHCalibrationCam::fAverageHiGainAreas and +// MHCalibrationCam::fAverageLoGainAreas // // - average pixel per camera sector (e.g. sectors 1-6 for the MAGIC camera), -// stored in the TObjArray's fAverageHiGainSectors and fAverageLoGainSectors +// stored in the TObjArray's MHCalibrationCam::fAverageHiGainSectors and +// MHCalibrationCam::fAverageLoGainSectors // // Every signal is filled into a Charge histogram and an array, in order to perform // a Fourier analysis (see MHGausEvents). The signals are moreover averaged on an -// event-by-event basis and written into the TObjArray's fAverageHiGainAreas, -// fAverageLoGainAreas, fAverageHiGainSectors and fAverageLoGainSectors. +// event-by-event basis and written into the corresponding average pixels // // Additionally, the (FADC slice) position of the maximum is stored in an Absolute @@ -108,10 +110,5 @@ ///////////////////////////////////////////////////////////////////////////// #include "MHCalibrationChargeCam.h" - -#include -#include -#include -#include -#include +#include "MHCalibrationCam.h" #include "MLog.h" @@ -146,5 +143,4 @@ const Float_t MHCalibrationChargeCam::fgNumHiGainSaturationLimit = 0.01; const Float_t MHCalibrationChargeCam::fgNumLoGainSaturationLimit = 0.005; -const Int_t MHCalibrationChargeCam::fgPulserFrequency = 500; // -------------------------------------------------------------------------- // @@ -154,5 +150,5 @@ // - all pointers to NULL // -// Initializes and sets owner of: +// Initializes and sets owner of (done in MHCalibrationCam): // - fHiGainArray, fLoGainArray // - fAverageHiGainAreas, fAverageLoGainAreas @@ -162,5 +158,5 @@ // - fNumHiGainSaturationLimit to fgNumHiGainSaturationLimit // - fNumLoGainSaturationLimit to fgNumLoGainSaturationLimit -// - fPulserFrequency to fgPulserFrequency +// - fPulserFrequency to fgPulserFrequency (in MHCalibrationCam) // MHCalibrationChargeCam::MHCalibrationChargeCam(const char *name, const char *title) @@ -170,225 +166,6 @@ fTitle = title ? title : "Class to fill the calibration histograms "; - fHiGainArray = new TObjArray; - fHiGainArray->SetOwner(); - - fLoGainArray = new TObjArray; - fLoGainArray->SetOwner(); - - fAverageHiGainAreas = new TObjArray; - fAverageHiGainAreas->SetOwner(); - - fAverageLoGainAreas = new TObjArray; - fAverageLoGainAreas->SetOwner(); - - fAverageHiGainSectors = new TObjArray; - fAverageHiGainSectors->SetOwner(); - - fAverageLoGainSectors = new TObjArray; - fAverageLoGainSectors->SetOwner(); - SetNumHiGainSaturationLimit(); SetNumLoGainSaturationLimit(); - SetPulserFrequency(); -} - -// -------------------------------------------------------------------------- -// -// Deletes the TClonesArray of: -// - fHiGainArray, fLoGainArray -// - fAverageHiGainAreas, fAverageLoGainAreas -// - fAverageHiGainSectors, fAverageLoGainSectors -// -MHCalibrationChargeCam::~MHCalibrationChargeCam() -{ - delete fHiGainArray; - delete fLoGainArray; - - delete fAverageHiGainAreas; - delete fAverageLoGainAreas; - - delete fAverageHiGainSectors; - delete fAverageLoGainSectors; -} - -// -------------------------------------------------------------------------- -// -// Get i-th High Gain pixel (pixel number) -// -MHCalibrationChargeHiGainPix &MHCalibrationChargeCam::operator[](UInt_t i) -{ - return *static_cast(fHiGainArray->UncheckedAt(i)); -} - -// -------------------------------------------------------------------------- -// -// Get i-th High Gain pixel (pixel number) -// -const MHCalibrationChargeHiGainPix &MHCalibrationChargeCam::operator[](UInt_t i) const -{ - return *static_cast(fHiGainArray->UncheckedAt(i)); -} - -// -------------------------------------------------------------------------- -// -// Get i-th Low Gain pixel (pixel number) -// -MHCalibrationChargeLoGainPix &MHCalibrationChargeCam::operator()(UInt_t i) -{ - return *static_cast(fLoGainArray->UncheckedAt(i)); -} - -// -------------------------------------------------------------------------- -// -// Get i-th Low Gain pixel (pixel number) -// -const MHCalibrationChargeLoGainPix &MHCalibrationChargeCam::operator()(UInt_t i) const -{ - return *static_cast(fLoGainArray->UncheckedAt(i)); -} - -// -------------------------------------------------------------------------- -// -// Get i-th High Gain pixel Area (area number) -// -MHCalibrationChargeHiGainPix &MHCalibrationChargeCam::GetAverageHiGainArea(UInt_t i) -{ - return *static_cast(fAverageHiGainAreas->UncheckedAt(i)); -} - -// -------------------------------------------------------------------------- -// -// Get i-th High Gain pixel Area (area number) -// -const MHCalibrationChargeHiGainPix &MHCalibrationChargeCam::GetAverageHiGainArea(UInt_t i) const -{ - return *static_cast(fAverageHiGainAreas->UncheckedAt(i)); -} - -// -------------------------------------------------------------------------- -// -// Get i-th Low Gain pixel Area (area number) -// -MHCalibrationChargeLoGainPix &MHCalibrationChargeCam::GetAverageLoGainArea(UInt_t i) -{ - return *static_cast(fAverageLoGainAreas->UncheckedAt(i)); -} - -// -------------------------------------------------------------------------- -// -// Get i-th Low Gain pixel Area (area number) -// -const MHCalibrationChargeLoGainPix &MHCalibrationChargeCam::GetAverageLoGainArea(UInt_t i) const -{ - return *static_cast(fAverageLoGainAreas->UncheckedAt(i)); -} - -// -------------------------------------------------------------------------- -// -// Get i-th High Gain Sector (sector number) -// -MHCalibrationChargeHiGainPix &MHCalibrationChargeCam::GetAverageHiGainSector(UInt_t i) -{ - return *static_cast(fAverageHiGainSectors->UncheckedAt(i)); -} - -// -------------------------------------------------------------------------- -// -// Get i-th High Gain Sector (sector number) -// -const MHCalibrationChargeHiGainPix &MHCalibrationChargeCam::GetAverageHiGainSector(UInt_t i) const -{ - return *static_cast(fAverageHiGainSectors->UncheckedAt(i)); -} - -// -------------------------------------------------------------------------- -// -// Get i-th Low Gain Sector (sector number) -// -MHCalibrationChargeLoGainPix &MHCalibrationChargeCam::GetAverageLoGainSector(UInt_t i) -{ - return *static_cast(fAverageLoGainSectors->UncheckedAt(i)); -} - -// -------------------------------------------------------------------------- -// -// Get i-th Low Gain Sector (sector number) -// -const MHCalibrationChargeLoGainPix &MHCalibrationChargeCam::GetAverageLoGainSector(UInt_t i) const -{ - return *static_cast(fAverageLoGainSectors->UncheckedAt(i)); -} - -// -------------------------------------------------------------------------- -// -// Our own clone function is necessary since root 3.01/06 or Mars 0.4 -// I don't know the reason. -// -// Creates new MHCalibrationChargeCam -// Deletes the TObjArray's and Clones them individually -// Copies the TArray's -// -TObject *MHCalibrationChargeCam::Clone(const char *) const -{ - - const Int_t nhi = fHiGainArray->GetEntries(); - const Int_t nlo = fLoGainArray->GetEntries(); - const Int_t navhi = fAverageHiGainAreas->GetEntries(); - const Int_t navlo = fAverageLoGainAreas->GetEntries(); - const Int_t nsehi = fAverageHiGainSectors->GetEntries(); - const Int_t nselo = fAverageLoGainSectors->GetEntries(); - - // - // FIXME, this might be done faster and more elegant, by direct copy. - // - MHCalibrationChargeCam *cam = new MHCalibrationChargeCam(); - - cam->fHiGainArray->Expand(nhi); - cam->fLoGainArray->Expand(nlo); - cam->fAverageHiGainAreas->Expand(navhi); - cam->fAverageLoGainAreas->Expand(navlo); - cam->fAverageHiGainSectors->Expand(nsehi); - cam->fAverageLoGainSectors->Expand(nselo); - - for (int i=0; ifHiGainArray)[i]; - (*cam->fHiGainArray)[i] = (MHCalibrationChargeHiGainPix*)(*fHiGainArray)[i]->Clone(); - } - for (int i=0; ifLoGainArray)[i]; - (*cam->fLoGainArray)[i] = (MHCalibrationChargeLoGainPix*)(*fLoGainArray)[i]->Clone(); - } - for (int i=0; ifAverageHiGainAreas)[i]; - (*cam->fAverageHiGainAreas)[i] = (MHCalibrationChargeHiGainPix*)(*fAverageHiGainAreas)[i]->Clone(); - } - for (int i=0; ifAverageLoGainAreas)[i]; - (*cam->fAverageLoGainAreas)[i] = (MHCalibrationChargeLoGainPix*)(*fAverageLoGainAreas)[i]->Clone(); - } - for (int i=0; ifAverageHiGainSectors)[i]; - (*cam->fAverageHiGainSectors)[i] = (MHCalibrationChargeHiGainPix*)(*fAverageHiGainSectors)[i]->Clone(); - } - for (int i=0; ifAverageLoGainSectors)[i]; - (*cam->fAverageLoGainSectors)[i] = (MHCalibrationChargeLoGainPix*)(*fAverageLoGainSectors)[i]->Clone(); - } - - cam->fAverageAreaNum = fAverageAreaNum; - cam->fAverageAreaSat = fAverageAreaSat; - cam->fAverageAreaSigma = fAverageAreaSigma; - cam->fAverageAreaSigmaErr = fAverageAreaSigmaErr; - cam->fAverageAreaRelSigma = fAverageAreaRelSigma; - cam->fAverageAreaRelSigmaErr = fAverageAreaRelSigmaErr; - cam->fAverageSectorNum = fAverageSectorNum; - - return cam; } @@ -400,7 +177,7 @@ // // Calls Delete-Function of: -// - fHiGainArray, fLoGainArray -// - fAverageHiGainAreas, fAverageLoGainAreas -// - fAverageHiGainSectors, fAverageLoGainSectors +// - MHCalibrationCam::fHiGainArray, MHCalibrationCam::fLoGainArray +// - MHCalibrationCam::fAverageHiGainAreas, MHCalibrationCam::fAverageLoGainAreas +// - MHCalibrationCam::fAverageHiGainSectors, MHCalibrationCam::fAverageLoGainSectors // Bool_t MHCalibrationChargeCam::SetupFill(const MParList *pList) @@ -443,26 +220,26 @@ // // Initializes, if empty to MExtractedSignalCam::GetSize() for: -// - fHiGainArray, fLoGainArray +// - MHCalibrationCam::fHiGainArray, MHCalibrationCam::fLoGainArray // // Initializes, if empty to MGeomCam::GetNumAreas() for: -// - fAverageHiGainAreas, fAverageLoGainAreas +// - MHCalibrationCam::fAverageHiGainAreas, MHCalibrationCam::fAverageLoGainAreas // // Initializes, if empty to MGeomCam::GetNumSectors() for: -// - fAverageHiGainSectors, fAverageLoGainSectors +// - MHCalibrationCam::fAverageHiGainSectors, MHCalibrationCam::fAverageLoGainSectors // // Initializes TArrays to MGeomCam::GetNumAreas and MGeomCam::GetNumSectors, respectively // Fills with number of valid pixels (if !MBadPixelsPix::IsBad()): -// - fAverageAreaNum[area index] -// - fAverageSectorNum[area index] +// - MHCalibrationCam::fAverageAreaNum[area index] +// - MHCalibrationCam::fAverageSectorNum[area index] // // Calls InitializeHiGainHists() and InitializeLoGainHists() for every entry in: -// - fHiGainArray, fLoGainArray -// - fAverageHiGainAreas, fAverageLoGainAreas -// - fAverageHiGainSectors, fAverageLoGainSectors +// - MHCalibrationCam::fHiGainArray, MHCalibrationCam::fLoGainArray +// - MHCalibrationCam::fAverageHiGainAreas, MHCalibrationCam::fAverageLoGainAreas +// - MHCalibrationCam::fAverageHiGainSectors, MHCalibrationCam::fAverageLoGainSectors // // Sets Titles and Names for the Charge Histograms and // Sets number of bins to fAverageNbins for: -// - fAverageHiGainAreas, fAverageLoGainAreas -// - fAverageHiGainSectors, fAverageLoGainSectors +// - MHCalibrationCam::fAverageHiGainAreas, MHCalibrationCam::fAverageLoGainAreas +// - MHCalibrationCam::fAverageHiGainSectors, MHCalibrationCam::fAverageLoGainSectors // Bool_t MHCalibrationChargeCam::ReInit(MParList *pList) @@ -514,5 +291,5 @@ { (*fHiGainArray)[i] = new MHCalibrationChargeHiGainPix; - InitializeHiGainHists((*this)[i],(*fBadPixels)[i],i); + InitializeHiGainHists((MHCalibrationChargePix&)(*this)[i],(*fBadPixels)[i],i); } } @@ -526,5 +303,5 @@ { (*fLoGainArray)[i] = new MHCalibrationChargeLoGainPix; - InitializeLoGainHists((*this)(i),(*fBadPixels)[i],i); + InitializeLoGainHists((MHCalibrationChargePix&)(*this)(i),(*fBadPixels)[i],i); } @@ -540,8 +317,12 @@ new MHCalibrationChargeHiGainPix("AverageHiGainArea", "Average HiGain FADC sums area idx "); - InitializeHiGainHists(GetAverageHiGainArea(j),fCam->GetAverageBadArea(j),j); - GetAverageHiGainArea(j).GetHGausHist()->SetTitle("Summed FADC slices average HiGain Area Idx "); - GetAverageHiGainArea(j).GetHAbsTime()->SetTitle("Absolute Arrival Time average HiGain Area Idx "); - GetAverageHiGainArea(j).SetChargeNbins(fAverageNbins); + + MHCalibrationChargePix &hist = (MHCalibrationChargePix&)GetAverageHiGainArea(j); + + InitializeHiGainHists(hist,fCam->GetAverageBadArea(j),j); + + hist.GetHGausHist()->SetTitle("Summed FADC slices average HiGain Area Idx "); + hist.SetChargeNbins(fAverageNbins); + hist.GetHAbsTime()->SetTitle("Absolute Arrival Time average HiGain Area Idx "); } } @@ -556,8 +337,13 @@ new MHCalibrationChargeLoGainPix("AverageLoGainArea", "Average LoGain FADC sums of pixel area idx "); - InitializeLoGainHists(GetAverageLoGainArea(j),fCam->GetAverageBadArea(j),j); - GetAverageLoGainArea(j).GetHGausHist()->SetTitle("Summed FADC slices average LoGain Area Idx "); - GetAverageLoGainArea(j).GetHAbsTime()->SetTitle("Absolute Arrival Time average LoGain Area Idx "); - GetAverageLoGainArea(j).SetChargeNbins(fAverageNbins); + + MHCalibrationChargePix &hist = (MHCalibrationChargePix&)GetAverageLoGainArea(j); + + InitializeLoGainHists(hist,fCam->GetAverageBadArea(j),j); + + hist.GetHGausHist()->SetTitle("Summed FADC slices average LoGain Area Idx "); + hist.SetChargeNbins(fAverageNbins); + hist.GetHAbsTime()->SetTitle("Absolute Arrival Time average LoGain Area Idx "); + } } @@ -572,8 +358,13 @@ new MHCalibrationChargeHiGainPix("AverageHiGainSector", "Average HiGain FADC sums of pixel sector "); - InitializeHiGainHists(GetAverageHiGainSector(j),fCam->GetAverageBadSector(j),j); - GetAverageHiGainSector(j).GetHGausHist()->SetTitle("Summed FADC slices average HiGain Sector "); - GetAverageHiGainSector(j).GetHAbsTime()->SetTitle("Absolute Arrival Time average HiGain Sector "); - GetAverageHiGainSector(j).SetChargeNbins(fAverageNbins); + + MHCalibrationChargePix &hist = (MHCalibrationChargePix&)GetAverageHiGainSector(j); + + InitializeHiGainHists(hist,fCam->GetAverageBadSector(j),j); + + hist.GetHGausHist()->SetTitle("Summed FADC slices average HiGain Sector "); + hist.SetChargeNbins(fAverageNbins); + hist.GetHAbsTime()->SetTitle("Absolute Arrival Time average HiGain Sector "); + } } @@ -588,8 +379,13 @@ new MHCalibrationChargeLoGainPix("AverageLoGainSector", "Average LoGain FADC sums of pixel sector "); - InitializeLoGainHists(GetAverageLoGainSector(j),fCam->GetAverageBadSector(j),j); - GetAverageLoGainSector(j).GetHGausHist()->SetTitle("Summed FADC slices average LoGain Sector "); - GetAverageLoGainSector(j).GetHAbsTime()->SetTitle("Absolute Arrival Time average LoGain Sector "); - GetAverageLoGainSector(j).SetChargeNbins(fAverageNbins); + + MHCalibrationChargePix &hist = (MHCalibrationChargePix&)GetAverageLoGainSector(j); + + InitializeLoGainHists(hist,fCam->GetAverageBadSector(j),j); + + hist.GetHGausHist()->SetTitle("Summed FADC slices average LoGain Sector "); + hist.SetChargeNbins(fAverageNbins); + hist.GetHAbsTime()->SetTitle("Absolute Arrival Time average LoGain Sector "); + } } @@ -601,5 +397,5 @@ // // If MBadPixelsPix::IsBad(): -// - calls MHCalibrationChargeHiGainPix::SetExcluded() +// - calls MHCalibrationChargePix::SetExcluded() // // Calls: @@ -608,5 +404,5 @@ // - MHGausEvents::SetEventFrequency(fPulserFrequency) // -void MHCalibrationChargeCam::InitializeHiGainHists(MHCalibrationChargeHiGainPix &hist,MBadPixelsPix &bad, const Int_t i) +void MHCalibrationChargeCam::InitializeHiGainHists(MHCalibrationChargePix &hist, MBadPixelsPix &bad, const Int_t i) { @@ -626,5 +422,5 @@ // // If MBadPixelsPix::IsBad(): -// - calls MHCalibrationChargeLoGainPix::SetExcluded() +// - calls MHCalibrationChargePix::SetExcluded() // // Calls: @@ -633,5 +429,5 @@ // - MHGausEvents::SetEventFrequency(fPulserFrequency) // -void MHCalibrationChargeCam::InitializeLoGainHists(MHCalibrationChargeLoGainPix &hist,MBadPixelsPix &bad, const Int_t i) +void MHCalibrationChargeCam::InitializeLoGainHists(MHCalibrationChargePix &hist,MBadPixelsPix &bad, const Int_t i) { @@ -738,5 +534,8 @@ { - if ((*this)[i].IsExcluded()) + MHCalibrationChargePix &histhi = (MHCalibrationChargePix&)(*this)[i]; + MHCalibrationChargePix &histlo = (MHCalibrationChargePix&)(*this)(i); + + if (histhi.IsExcluded()) continue; @@ -746,12 +545,12 @@ const Float_t sumlo = pix.GetExtractedSignalLoGain(); - (*this)[i].FillHistAndArray(sumhi); - (*this)(i).FillHistAndArray(sumlo); + histhi.FillHistAndArray(sumhi); + histlo.FillHistAndArray(sumlo); const Int_t sathi = (Int_t)pix.GetNumHiGainSaturated(); const Int_t satlo = (Int_t)pix.GetNumLoGainSaturated(); - (*this)[i].SetSaturated(sathi); - (*this)(i).SetSaturated(satlo); + histhi.SetSaturated(sathi); + histlo.SetSaturated(satlo); const Int_t aidx = (*fGeom)[i].GetAidx(); @@ -774,12 +573,16 @@ const UInt_t pixid = pixel.GetPixelId(); - if ((*this)[pixid].IsExcluded()) + + MHCalibrationChargePix &histhi = (MHCalibrationChargePix&)(*this)[pixid]; + MHCalibrationChargePix &histlo = (MHCalibrationChargePix&)(*this)(pixid); + + if (histhi.IsExcluded()) continue; - + const Float_t timehi = (Float_t)pixel.GetIdxMaxHiGainSample(); const Float_t timelo = (Float_t)pixel.GetIdxMaxLoGainSample(lofirst); - (*this)[pixid].FillAbsTime(timehi); - (*this)(pixid).FillAbsTime(timelo); + histhi.FillAbsTime(timehi); + histlo.FillAbsTime(timelo); const Int_t aidx = (*fGeom)[pixid].GetAidx(); @@ -799,6 +602,6 @@ const Int_t npix = fAverageAreaNum[j]; - MHCalibrationChargeHiGainPix &hipix = GetAverageHiGainArea(j); - MHCalibrationChargeLoGainPix &lopix = GetAverageLoGainArea(j); + MHCalibrationChargePix &hipix = (MHCalibrationChargePix&)GetAverageHiGainArea(j); + MHCalibrationChargePix &lopix = (MHCalibrationChargePix&)GetAverageLoGainArea(j); hipix.FillHistAndArray(sumhiarea[j]/npix); @@ -818,6 +621,6 @@ const Int_t npix = fAverageSectorNum[j]; - MHCalibrationChargeHiGainPix &hipix = GetAverageHiGainSector(j); - MHCalibrationChargeLoGainPix &lopix = GetAverageLoGainSector(j); + MHCalibrationChargePix &hipix = (MHCalibrationChargePix&)GetAverageHiGainSector(j); + MHCalibrationChargePix &lopix = (MHCalibrationChargePix&)GetAverageLoGainSector(j); hipix.FillHistAndArray(sumhisector[j]/npix); @@ -852,65 +655,67 @@ { - if ((*this)[i].IsExcluded()) + MHCalibrationChargePix &histhi = (MHCalibrationChargePix&)(*this)[i]; + + if (histhi.IsExcluded()) continue; - MHCalibrationChargeHiGainPix &histhi = (*this)[i]; + MCalibrationChargePix &pix = (*fCam)[i]; + MBadPixelsPix &bad = (*fBadPixels)[i]; + + FinalizeHiGainHists(histhi,pix,bad); + + } + + for (Int_t i=0; iGetSize(); i++) + { + + MHCalibrationChargePix &histlo = (MHCalibrationChargePix&)(*this)(i); + + if (histlo.IsExcluded()) + continue; + MCalibrationChargePix &pix = (*fCam)[i]; MBadPixelsPix &bad = (*fBadPixels)[i]; + FinalizeLoGainHists(histlo,pix,bad); + + } + + for (Int_t j=0; jGetSize(); j++) + { + + MHCalibrationChargePix &histhi = (MHCalibrationChargePix&)GetAverageHiGainArea(j); + MCalibrationChargePix &pix = fCam->GetAverageArea(j); + MBadPixelsPix &bad = fCam->GetAverageBadArea(j); + FinalizeHiGainHists(histhi,pix,bad); - - } - - for (Int_t i=0; iGetSize(); i++) - { - - if ((*this)(i).IsExcluded()) - continue; - - MHCalibrationChargeLoGainPix &histlo = (*this)(i); - MCalibrationChargePix &pix = (*fCam)[i]; - MBadPixelsPix &bad = (*fBadPixels)[i]; + } + + for (Int_t j=0; jGetSize(); j++) + { + + MHCalibrationChargePix &histlo = (MHCalibrationChargePix&)GetAverageLoGainArea(j); + MCalibrationChargePix &pix = fCam->GetAverageArea(j); + MBadPixelsPix &bad = fCam->GetAverageBadArea(j); FinalizeLoGainHists(histlo,pix,bad); - - } - - for (Int_t j=0; jGetSize(); j++) - { - - MHCalibrationChargeHiGainPix &histhi = GetAverageHiGainArea(j); - MCalibrationChargePix &pix = fCam->GetAverageArea(j); - MBadPixelsPix &bad = fCam->GetAverageBadArea(j); + } + + for (Int_t j=0; jGetSize(); j++) + { + + MHCalibrationChargePix &histhi = (MHCalibrationChargePix&)GetAverageHiGainSector(j); + MCalibrationChargePix &pix = fCam->GetAverageSector(j); + MBadPixelsPix &bad = fCam->GetAverageBadSector(j); FinalizeHiGainHists(histhi,pix,bad); } - for (Int_t j=0; jGetSize(); j++) - { - - MHCalibrationChargeLoGainPix &histlo = GetAverageLoGainArea(j); - MCalibrationChargePix &pix = fCam->GetAverageArea(j); - MBadPixelsPix &bad = fCam->GetAverageBadArea(j); - - FinalizeLoGainHists(histlo,pix,bad); - } - - for (Int_t j=0; jGetSize(); j++) - { - - MHCalibrationChargeHiGainPix &histhi = GetAverageHiGainSector(j); - MCalibrationChargePix &pix = fCam->GetAverageSector(j); - MBadPixelsPix &bad = fCam->GetAverageBadSector(j); - - FinalizeHiGainHists(histhi,pix,bad); - } - for (Int_t j=0; jGetSize(); j++) { - MHCalibrationChargeLoGainPix &histlo = GetAverageLoGainSector(j); - MCalibrationChargePix &pix = fCam->GetAverageSector(j); - MBadPixelsPix &bad = fCam->GetAverageBadSector(j); + MHCalibrationChargePix &histlo = (MHCalibrationChargePix&)GetAverageLoGainSector(j); + MCalibrationChargePix &pix = fCam->GetAverageSector(j); + MBadPixelsPix &bad = fCam->GetAverageBadSector(j); FinalizeLoGainHists(histlo,pix,bad); @@ -970,5 +775,5 @@ // Retrieves the results and store them in MCalibrationChargePix // -void MHCalibrationChargeCam::FinalizeHiGainHists(MHCalibrationChargeHiGainPix &hist, +void MHCalibrationChargeCam::FinalizeHiGainHists(MHCalibrationChargePix &hist, MCalibrationChargePix &pix, MBadPixelsPix &bad) @@ -1066,5 +871,5 @@ // Retrieves the results and store them in MCalibrationChargePix // -void MHCalibrationChargeCam::FinalizeLoGainHists(MHCalibrationChargeLoGainPix &hist, +void MHCalibrationChargeCam::FinalizeLoGainHists(MHCalibrationChargePix &hist, MCalibrationChargePix &pix, MBadPixelsPix &bad) @@ -1155,83 +960,2 @@ } -// ----------------------------------------------------------------------------- -// -// Default draw: -// -// Displays the averaged areas, both High Gain and Low Gain -// -// The following options can be chosen: -// -// "": displays the fHGausHist and the fHAbsTime -// "all": executes additionally MHGausEvents::Draw(), with options -// -void MHCalibrationChargeCam::Draw(const Option_t *opt) -{ - - const Int_t nareas = fAverageHiGainAreas->GetEntries(); - if (nareas == 0) - return; - - TVirtualPad *pad = gPad ? gPad : MH::MakeDefCanvas(this); - pad->SetBorderMode(0); - - pad->Divide(2,nareas); - - for (Int_t i=0; icd(2*(i+1)-1); - GetAverageHiGainArea(i).Draw(opt); - - if (!fAverageAreaSat[i]) - DrawAverageSigma(fAverageAreaSat[i], i, - fAverageAreaSigma[i], fAverageAreaSigmaErr[i], - fAverageAreaRelSigma[i], fAverageAreaRelSigmaErr[i]); - - pad->cd(2*(i+1)); - GetAverageLoGainArea(i).Draw(opt); - - if (fAverageAreaSat[i]) - DrawAverageSigma(fAverageAreaSat[i], i, - fAverageAreaSigma[i], fAverageAreaSigmaErr[i], - fAverageAreaRelSigma[i], fAverageAreaRelSigmaErr[i]); - } -} - -// ----------------------------------------------------------------------------- -// -// Default draw: -// -// Displays a TPaveText with the re-normalized sigmas of the average area -// -void MHCalibrationChargeCam::DrawAverageSigma(Bool_t sat, Bool_t inner, - Float_t sigma, Float_t sigmaerr, - Float_t relsigma, Float_t relsigmaerr) const -{ - - if (sigma != 0) - { - - TPad *newpad = new TPad("newpad","transparent",0,0,1,1); - newpad->SetFillStyle(4000); - newpad->Draw(); - newpad->cd(); - - TPaveText *text = new TPaveText(sat? 0.1 : 0.35,0.7,sat ? 0.4 : 0.7,1.0); - text->SetTextSize(0.07); - const TString line1 = Form("%s%s%s",inner ? "Outer" : "Inner", - " Pixels ", sat ? "Low Gain" : "High Gain"); - TText *txt1 = text->AddText(line1.Data()); - const TString line2 = Form("Sigma per Pixel: %2.2f #pm %2.2f",sigma,sigmaerr); - TText *txt2 = text->AddText(line2.Data()); - const TString line3 = Form("Rel. Sigma per Pixel: %2.2f #pm %2.2f",relsigma,relsigmaerr); - TText *txt3 = text->AddText(line3.Data()); - text->Draw(""); - - text->SetBit(kCanDelete); - txt1->SetBit(kCanDelete); - txt2->SetBit(kCanDelete); - txt3->SetBit(kCanDelete); - newpad->SetBit(kCanDelete); - } -} - Index: /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.h =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.h (revision 3630) +++ /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.h (revision 3631) @@ -2,26 +2,8 @@ #define MARS_MHCalibrationChargeCam -#ifndef ROOT_TObjArray -#include +#ifndef MARS_MHCalibrationCam +#include "MHCalibrationCam.h" #endif -#ifndef ROOT_TArrayI -#include -#endif - -#ifndef ROOT_TArrayF -#include -#endif - -#ifndef MARS_MH -#include "MH.h" -#endif -#ifndef MARS_MCamEvent -#include "MCamEvent.h" -#endif - -class TText; -class TArrayI; -class TArrayF; class MRawEvtData; class MGeomCam; @@ -30,7 +12,6 @@ class MCalibrationChargeCam; class MCalibrationChargePix; -class MHCalibrationChargeHiGainPix; -class MHCalibrationChargeLoGainPix; -class MHCalibrationChargeCam : public MH, public MCamEvent +class MHCalibrationChargePix; +class MHCalibrationChargeCam : public MHCalibrationCam { private: @@ -39,18 +20,9 @@ static const Float_t fgNumHiGainSaturationLimit; // The default for fNumHiGainSaturationLimit static const Float_t fgNumLoGainSaturationLimit; // The default for fNumLoGainSaturationLimit - static const Int_t fgPulserFrequency; // The default for fPulserFrequency Int_t fAverageNbins; // Number of bins for the average histograms Float_t fNumHiGainSaturationLimit; // Rel. amount sat. higain FADC slices until pixel is called saturated Float_t fNumLoGainSaturationLimit; // Rel. amount sat. logain FADC slices until pixel is called saturated - Int_t fPulserFrequency; // Light pulser frequency - TObjArray *fHiGainArray; //-> Array of MHCalibrationChargeHiGainPix, one per pixel - TObjArray *fLoGainArray; //-> Array of MHCalibrationChargeLoGainPix, one per pixel - TObjArray *fAverageHiGainAreas; //-> Array of MHCalibrationChargeHiGainPix, one per pixel area - TObjArray *fAverageLoGainAreas; //-> Array of MHCalibrationChargeLoGainPix, one per pixel area - TObjArray *fAverageHiGainSectors; //-> Array of MHCalibrationChargeHiGainPix, one per camera sector - TObjArray *fAverageLoGainSectors; //-> Array of MHCalibrationChargeLoGainPix, one per camera sector - MCalibrationChargeCam *fCam; //! Calibration Cam with the results MRawEvtData *fRawEvt; //! Raw event data @@ -58,52 +30,22 @@ MBadPixelsCam *fBadPixels; //! Bad Pixels storage container - TArrayI fAverageAreaNum; // Number of pixels in average pixels per area - TArrayI fAverageAreaSat; // Number of saturated slices in average pixels per area - TArrayF fAverageAreaSigma; // Re-normalized sigmas in average pixels per area - TArrayF fAverageAreaSigmaErr; // Errors of Re-normalized sigmas in average pixels per area - TArrayF fAverageAreaRelSigma; // Re-normalized relative sigmas in average pixels per area - TArrayF fAverageAreaRelSigmaErr; // Errors of Re-normalized relative sigmas in average pixels per area + void InitializeHiGainHists(MHCalibrationChargePix &hist, MBadPixelsPix &bad, const Int_t i); + void InitializeLoGainHists(MHCalibrationChargePix &hist, MBadPixelsPix &bad, const Int_t i); + + void FinalizeHiGainHists(MHCalibrationChargePix &hist, MCalibrationChargePix &pix, MBadPixelsPix &bad); + void FinalizeLoGainHists(MHCalibrationChargePix &hist, MCalibrationChargePix &pix, MBadPixelsPix &bad); - TArrayI fAverageSectorNum; // Number of pixels in average pixels per sector - - void InitializeHiGainHists(MHCalibrationChargeHiGainPix &hist, MBadPixelsPix &bad, const Int_t i); - void InitializeLoGainHists(MHCalibrationChargeLoGainPix &hist, MBadPixelsPix &bad, const Int_t i); - - void FinalizeHiGainHists(MHCalibrationChargeHiGainPix &hist, MCalibrationChargePix &pix, MBadPixelsPix &bad); - void FinalizeLoGainHists(MHCalibrationChargeLoGainPix &hist, MCalibrationChargePix &pix, MBadPixelsPix &bad); - void DrawAverageSigma(Bool_t sat, Bool_t inner, - Float_t sigma, Float_t sigmaerr, - Float_t relsigma, Float_t relsigmaerr) const; - -public: + public: MHCalibrationChargeCam(const char *name=NULL, const char *title=NULL); - ~MHCalibrationChargeCam(); + ~MHCalibrationChargeCam() {} + void SetAverageNbins( const Int_t bins=fgAverageNbins ) { fAverageNbins = bins; } void SetNumLoGainSaturationLimit( const Float_t lim=fgNumLoGainSaturationLimit) { fNumLoGainSaturationLimit = lim; } void SetNumHiGainSaturationLimit( const Float_t lim=fgNumHiGainSaturationLimit) { fNumHiGainSaturationLimit = lim; } - void SetPulserFrequency ( const Int_t f=fgPulserFrequency) { fPulserFrequency = f; } - Float_t GetNumHiGainSaturationLimit() const { return fNumHiGainSaturationLimit; } - Float_t GetNumLoGainSaturationLimit() const { return fNumLoGainSaturationLimit; } - - MHCalibrationChargeHiGainPix &operator[](UInt_t i); - const MHCalibrationChargeHiGainPix &operator[](UInt_t i) const; - - MHCalibrationChargeLoGainPix &operator()(UInt_t i); - const MHCalibrationChargeLoGainPix &operator()(UInt_t i) const; - - MHCalibrationChargeHiGainPix &GetAverageHiGainArea(UInt_t i); - const MHCalibrationChargeHiGainPix &GetAverageHiGainArea(UInt_t i) const; - - MHCalibrationChargeLoGainPix &GetAverageLoGainArea(UInt_t i); - const MHCalibrationChargeLoGainPix &GetAverageLoGainArea(UInt_t i) const; - - MHCalibrationChargeHiGainPix &GetAverageHiGainSector(UInt_t i); - const MHCalibrationChargeHiGainPix &GetAverageHiGainSector(UInt_t i) const; - - MHCalibrationChargeLoGainPix &GetAverageLoGainSector(UInt_t i); - const MHCalibrationChargeLoGainPix &GetAverageLoGainSector(UInt_t i) const; + Float_t GetNumHiGainSaturationLimit() const { return fNumHiGainSaturationLimit; } + Float_t GetNumLoGainSaturationLimit() const { return fNumLoGainSaturationLimit; } Bool_t SetupFill(const MParList *pList); @@ -111,10 +53,4 @@ Bool_t Fill (const MParContainer *par, const Stat_t w=1); Bool_t Finalize ( ); - - // Clone - TObject *Clone(const char *) const; - - // Draw - void Draw(const Option_t *opt); Bool_t GetPixelContent ( Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type=0) const; Index: /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargePix.h =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargePix.h (revision 3630) +++ /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargePix.h (revision 3631) @@ -92,5 +92,5 @@ void CountPickup(); - ClassDef(MHCalibrationChargePix, 1) // Base Histogram class for a Calibration Pixel + ClassDef(MHCalibrationChargePix, 1) // Base Histogram class for a Charge Calibration Pixel };