Index: /trunk/MagicSoft/Mars/Changelog =================================================================== --- /trunk/MagicSoft/Mars/Changelog (revision 3623) +++ /trunk/MagicSoft/Mars/Changelog (revision 3624) @@ -19,4 +19,12 @@ -*-*- END OF LINE -*-*- + + 2004/04/01: Markus Gaug + + * mcalib/MHCalibrationChargeCam.[h,cc] + * mcalib/MCalibrationChargeCam.[h,cc] + * mcalib/MCalibrationChargeCalc.cc + * manalysis/MGeomApply.cc + - add average pixels per sector 2004/03/31: Markus Gaug Index: /trunk/MagicSoft/Mars/macros/calibration.C =================================================================== --- /trunk/MagicSoft/Mars/macros/calibration.C (revision 3623) +++ /trunk/MagicSoft/Mars/macros/calibration.C (revision 3624) @@ -27,11 +27,14 @@ { - const TString inpath = "/home/rootdata/BlindPixel/"; + // const TString inpath = "/mnt/Data/rootdata/CrabNebula/2004_01_27/"; + const TString inpath = "/mnt/Data/rootdata/Miscellaneous/2004_03_03/"; + // const TString inpath = "/home/rootdata/BlindPixel/"; MRunIter pruns; MRunIter cruns; - pruns.AddRun(22007,inpath); - cruns.AddRun(22006,inpath); + pruns.AddRun(20132,inpath); + cruns.AddRun(20134,inpath); + // cruns.AddRun(16774,inpath); gStyle->SetOptStat(1111); @@ -204,8 +207,20 @@ // // histblind.DrawClone("all"); - // histcharge[555].DrawClone("all"); + // histcharge[400].DrawClone("all"); // histcharge(5).DrawClone("all"); // histtime[5].DrawClone("fourierevents"); - + for (Int_t aidx=0;aidx<2;aidx++) + { + histcharge.GetAverageHiGainArea(aidx).DrawClone("all"); + histcharge.GetAverageLoGainArea(aidx).DrawClone("all"); + } + + for (Int_t sector=1;sector<7;sector++) + { + histcharge.GetAverageHiGainSector(sector).DrawClone("all"); + histcharge.GetAverageLoGainSector(sector).DrawClone("all"); + } + + // Create histograms to display MHCamera disp1 (geomcam, "Cal;Charge", "Fitted Mean Charges"); Index: /trunk/MagicSoft/Mars/manalysis/MGeomApply.cc =================================================================== --- /trunk/MagicSoft/Mars/manalysis/MGeomApply.cc (revision 3623) +++ /trunk/MagicSoft/Mars/manalysis/MGeomApply.cc (revision 3624) @@ -138,5 +138,6 @@ { cal->InitSize(cam->GetNumPixels()); - cal->InitAverageSize(cam->GetNumAreas()); + cal->InitAverageAreas(cam->GetNumAreas()); + cal->InitAverageSectors(cam->GetNumSectors()); } Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc (revision 3623) +++ /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc (revision 3624) @@ -642,6 +642,13 @@ { - FinalizeAvPedestals(fCam->GetAveragePix(aidx), avinnerped, avinnerprms,avinnernum); - FinalizeCharges(fCam->GetAveragePix(aidx),fCam->GetAverageBadPix(aidx)); + FinalizeAvPedestals(fCam->GetAverageArea(aidx), avinnerped, avinnerprms,avinnernum); + FinalizeCharges(fCam->GetAverageArea(aidx),fCam->GetAverageBadArea(aidx)); + } + + for (UInt_t sector=0; sectorGetNumSectors(); sector++) + { + + FinalizeAvPedestals(fCam->GetAverageSector(sector), avinnerped, avinnerprms,avinnernum); + FinalizeCharges(fCam->GetAverageSector(sector),fCam->GetAverageBadSector(sector)); } @@ -709,4 +716,6 @@ fCam->SetReadyToSave(); + + *fLog << err << "Sectors: " << fGeom->GetNumSectors() << endl; *fLog << inf << endl; Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc (revision 3623) +++ /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc (revision 3624) @@ -151,6 +151,8 @@ fPixels = new TClonesArray("MCalibrationChargePix",1); - fAveragePixels = new TClonesArray("MCalibrationChargePix",1); - fAverageBadPixels = new TClonesArray("MBadPixelsPix",1); + fAverageAreas = new TClonesArray("MCalibrationChargePix",1); + fAverageBadAreas = new TClonesArray("MBadPixelsPix",1); + fAverageSectors = new TClonesArray("MCalibrationChargePix",1); + fAverageBadSectors = new TClonesArray("MBadPixelsPix",1); Clear(); @@ -175,6 +177,9 @@ // delete fPixels; - delete fAveragePixels; - delete fAverageBadPixels; + delete fAverageAreas; + delete fAverageBadAreas; + delete fAverageSectors; + delete fAverageBadSectors; + if (fOffsets) @@ -200,8 +205,14 @@ } -void MCalibrationChargeCam::InitAverageSize(const UInt_t i) -{ - fAveragePixels->ExpandCreate(i); - fAverageBadPixels->ExpandCreate(i); +void MCalibrationChargeCam::InitAverageAreas(const UInt_t i) +{ + fAverageAreas->ExpandCreate(i); + fAverageBadAreas->ExpandCreate(i); +} + +void MCalibrationChargeCam::InitAverageSectors(const UInt_t i) +{ + fAverageSectors->ExpandCreate(i); + fAverageBadSectors->ExpandCreate(i); } @@ -220,7 +231,12 @@ } -Int_t MCalibrationChargeCam::GetAverageSize() const -{ - return fAveragePixels->GetEntriesFast(); +Int_t MCalibrationChargeCam::GetAverageAreas() const +{ + return fAverageAreas->GetEntriesFast(); +} + +Int_t MCalibrationChargeCam::GetAverageSectors() const +{ + return fAverageSectors->GetEntriesFast(); } @@ -248,7 +264,7 @@ // Get i-th average pixel (area number) // -MCalibrationChargePix &MCalibrationChargeCam::GetAveragePix(UInt_t i) -{ - return *static_cast(fAveragePixels->UncheckedAt(i)); +MCalibrationChargePix &MCalibrationChargeCam::GetAverageArea(UInt_t i) +{ + return *static_cast(fAverageAreas->UncheckedAt(i)); } @@ -257,7 +273,25 @@ // Get i-th average pixel (area number) // -const MCalibrationChargePix &MCalibrationChargeCam::GetAveragePix(UInt_t i) const -{ - return *static_cast(fAveragePixels->UncheckedAt(i)); +const MCalibrationChargePix &MCalibrationChargeCam::GetAverageArea(UInt_t i) const +{ + return *static_cast(fAverageAreas->UncheckedAt(i)); +} + +// -------------------------------------------------------------------------- +// +// Get i-th average pixel (sector number) +// +MCalibrationChargePix &MCalibrationChargeCam::GetAverageSector(UInt_t i) +{ + return *static_cast(fAverageSectors->UncheckedAt(i)); +} + +// -------------------------------------------------------------------------- +// +// Get i-th average pixel (sector number) +// +const MCalibrationChargePix &MCalibrationChargeCam::GetAverageSector(UInt_t i) const +{ + return *static_cast(fAverageSectors->UncheckedAt(i)); } @@ -266,7 +300,7 @@ // Get i-th average pixel (area number) // -MBadPixelsPix &MCalibrationChargeCam::GetAverageBadPix(UInt_t i) -{ - return *static_cast(fAverageBadPixels->UncheckedAt(i)); +MBadPixelsPix &MCalibrationChargeCam::GetAverageBadArea(UInt_t i) +{ + return *static_cast(fAverageBadAreas->UncheckedAt(i)); } @@ -275,7 +309,25 @@ // Get i-th average pixel (area number) // -const MBadPixelsPix &MCalibrationChargeCam::GetAverageBadPix(UInt_t i) const -{ - return *static_cast(fAverageBadPixels->UncheckedAt(i)); +const MBadPixelsPix &MCalibrationChargeCam::GetAverageBadArea(UInt_t i) const +{ + return *static_cast(fAverageBadAreas->UncheckedAt(i)); +} + +// -------------------------------------------------------------------------- +// +// Get i-th average pixel (sector number) +// +MBadPixelsPix &MCalibrationChargeCam::GetAverageBadSector(UInt_t i) +{ + return *static_cast(fAverageBadSectors->UncheckedAt(i)); +} + +// -------------------------------------------------------------------------- +// +// Get i-th average pixel (sector number) +// +const MBadPixelsPix &MCalibrationChargeCam::GetAverageBadSector(UInt_t i) const +{ + return *static_cast(fAverageBadSectors->UncheckedAt(i)); } @@ -291,8 +343,17 @@ // another ForEach does not compile, thus have to do the loop ourselves: // - for (Int_t i=0;iGetPedRms() << " +- " << pix->GetPedRmsErr() << " Mean signal: " << pix->GetMeanCharge() << " +- " << pix->GetMeanChargeErr() @@ -429,4 +490,17 @@ << endl; } + + TIter Next6(fAverageSectors); + while ((pix=(MCalibrationChargePix*)Next5())) + { + *fLog << all << "Average Sector:" + << " Ped. Rms: " << pix->GetPedRms() << " +- " << pix->GetPedRmsErr() + << " Mean signal: " << pix->GetMeanCharge() << " +- " << pix->GetMeanChargeErr() + << " Sigma signal: " << pix->GetSigmaCharge() << " +- "<< pix->GetSigmaChargeErr() + << " Reduced Sigma: " << pix->GetRSigmaCharge() + << " Nr Phe's: " << pix->GetPheFFactorMethod() + << endl; + } + } Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.h =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.h (revision 3623) +++ /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.h (revision 3624) @@ -33,6 +33,8 @@ TClonesArray *fPixels; //-> Array of MCalibrationChargePix, one per pixel - TClonesArray *fAveragePixels; //-> Array of MCalibrationChargePix, one per pixel area - TClonesArray *fAverageBadPixels; //-> Array of MBadPixelsPix, one per pixel area + TClonesArray *fAverageAreas; //-> Array of MCalibrationChargePix, one per pixel area + TClonesArray *fAverageSectors; //-> Array of MCalibrationChargePix, one per camera sector + TClonesArray *fAverageBadAreas; //-> Array of MBadPixelsPix, one per pixel area + TClonesArray *fAverageBadSectors; //-> Array of MBadPixelsPix, one per camera sector TH1D* fOffsets; //! @@ -62,5 +64,6 @@ void Clear( Option_t *o="" ); void InitSize( const UInt_t i ); - void InitAverageSize( const UInt_t i ); + void InitAverageAreas( const UInt_t i ); + void InitAverageSectors( const UInt_t i ); // Setters @@ -77,5 +80,6 @@ // Getters Int_t GetSize() const; - Int_t GetAverageSize() const; + Int_t GetAverageAreas() const; + Int_t GetAverageSectors() const; Bool_t GetConversionFactorFFactor( Int_t ipx, Float_t &mean, Float_t &err, Float_t &sigma ); @@ -101,9 +105,15 @@ const MCalibrationChargePix &operator[](UInt_t i) const; - MCalibrationChargePix &GetAveragePix(UInt_t i); - const MCalibrationChargePix &GetAveragePix(UInt_t i) const; + MCalibrationChargePix &GetAverageArea(UInt_t i); + const MCalibrationChargePix &GetAverageArea(UInt_t i) const; - MBadPixelsPix &GetAverageBadPix(UInt_t i); - const MBadPixelsPix &GetAverageBadPix(UInt_t i) const; + MBadPixelsPix &GetAverageBadArea(UInt_t i); + const MBadPixelsPix &GetAverageBadArea(UInt_t i) const; + + MCalibrationChargePix &GetAverageSector(UInt_t i); + const MCalibrationChargePix &GetAverageSector(UInt_t i) const; + + MBadPixelsPix &GetAverageBadSector(UInt_t i); + const MBadPixelsPix &GetAverageBadSector(UInt_t i) const; // Prints Index: /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc (revision 3623) +++ /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc (revision 3624) @@ -112,9 +112,15 @@ fLoGainArray->SetOwner(); - fAverageHiGainArray = new TObjArray; - fAverageHiGainArray->SetOwner(); - - fAverageLoGainArray = new TObjArray; - fAverageLoGainArray->SetOwner(); + fAverageHiGainAreas = new TObjArray; + fAverageHiGainAreas->SetOwner(); + + fAverageLoGainAreas = new TObjArray; + fAverageLoGainAreas->SetOwner(); + + fAverageHiGainSectors = new TObjArray; + fAverageHiGainSectors->SetOwner(); + + fAverageLoGainSectors = new TObjArray; + fAverageLoGainSectors->SetOwner(); SetNumHiGainSaturationLimit(); @@ -133,6 +139,9 @@ delete fLoGainArray; - delete fAverageHiGainArray; - delete fAverageLoGainArray; + delete fAverageHiGainAreas; + delete fAverageLoGainAreas; + + delete fAverageHiGainSectors; + delete fAverageLoGainSectors; } @@ -177,34 +186,70 @@ // Get i-th pixel (pixel number) // -MHCalibrationChargeHiGainPix &MHCalibrationChargeCam::GetAverageHiGainPix(UInt_t i) -{ - return *static_cast(fAverageHiGainArray->UncheckedAt(i)); -} - -// -------------------------------------------------------------------------- -// -// Get i-th pixel (pixel number) -// -const MHCalibrationChargeHiGainPix &MHCalibrationChargeCam::GetAverageHiGainPix(UInt_t i) const -{ - return *static_cast(fAverageHiGainArray->UncheckedAt(i)); -} - -// -------------------------------------------------------------------------- -// -// Get i-th pixel (pixel number) -// -MHCalibrationChargeLoGainPix &MHCalibrationChargeCam::GetAverageLoGainPix(UInt_t i) -{ - return *static_cast(fAverageLoGainArray->UncheckedAt(i)); -} - -// -------------------------------------------------------------------------- -// -// Get i-th pixel (pixel number) -// -const MHCalibrationChargeLoGainPix &MHCalibrationChargeCam::GetAverageLoGainPix(UInt_t i) const -{ - return *static_cast(fAverageLoGainArray->UncheckedAt(i)); +MHCalibrationChargeHiGainPix &MHCalibrationChargeCam::GetAverageHiGainArea(UInt_t i) +{ + return *static_cast(fAverageHiGainAreas->UncheckedAt(i)); +} + +// -------------------------------------------------------------------------- +// +// Get i-th pixel (pixel number) +// +const MHCalibrationChargeHiGainPix &MHCalibrationChargeCam::GetAverageHiGainArea(UInt_t i) const +{ + return *static_cast(fAverageHiGainAreas->UncheckedAt(i)); +} + +// -------------------------------------------------------------------------- +// +// Get i-th pixel (pixel number) +// +MHCalibrationChargeLoGainPix &MHCalibrationChargeCam::GetAverageLoGainArea(UInt_t i) +{ + return *static_cast(fAverageLoGainAreas->UncheckedAt(i)); +} + +// -------------------------------------------------------------------------- +// +// Get i-th pixel (pixel number) +// +const MHCalibrationChargeLoGainPix &MHCalibrationChargeCam::GetAverageLoGainArea(UInt_t i) const +{ + return *static_cast(fAverageLoGainAreas->UncheckedAt(i)); +} + +// -------------------------------------------------------------------------- +// +// Get i-th pixel (pixel number) +// +MHCalibrationChargeHiGainPix &MHCalibrationChargeCam::GetAverageHiGainSector(UInt_t i) +{ + return *static_cast(fAverageHiGainSectors->UncheckedAt(i)); +} + +// -------------------------------------------------------------------------- +// +// Get i-th pixel (pixel number) +// +const MHCalibrationChargeHiGainPix &MHCalibrationChargeCam::GetAverageHiGainSector(UInt_t i) const +{ + return *static_cast(fAverageHiGainSectors->UncheckedAt(i)); +} + +// -------------------------------------------------------------------------- +// +// Get i-th pixel (pixel number) +// +MHCalibrationChargeLoGainPix &MHCalibrationChargeCam::GetAverageLoGainSector(UInt_t i) +{ + return *static_cast(fAverageLoGainSectors->UncheckedAt(i)); +} + +// -------------------------------------------------------------------------- +// +// Get i-th pixel (pixel number) +// +const MHCalibrationChargeLoGainPix &MHCalibrationChargeCam::GetAverageLoGainSector(UInt_t i) const +{ + return *static_cast(fAverageLoGainSectors->UncheckedAt(i)); } @@ -219,9 +264,9 @@ const Int_t nhi = fHiGainArray->GetEntries(); const Int_t nlo = fLoGainArray->GetEntries(); - const Int_t navhi = fAverageHiGainArray->GetEntries(); - const Int_t navlo = fAverageLoGainArray->GetEntries(); - - *fLog << err << nhi << " " << nlo << " " << navhi << " " << navlo << endl; - + 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. @@ -231,6 +276,8 @@ cam->fHiGainArray->Expand(nhi); cam->fLoGainArray->Expand(nlo); - cam->fAverageHiGainArray->Expand(navhi); - cam->fAverageLoGainArray->Expand(navlo); + cam->fAverageHiGainAreas->Expand(navhi); + cam->fAverageLoGainAreas->Expand(navlo); + cam->fAverageHiGainSectors->Expand(nsehi); + cam->fAverageLoGainSectors->Expand(nselo); for (int i=0; ifAverageHiGainArray)[i]; - (*cam->fAverageHiGainArray)[i] = (MHCalibrationChargeHiGainPix*)(*fAverageHiGainArray)[i]->Clone(); + delete (*cam->fAverageHiGainAreas)[i]; + (*cam->fAverageHiGainAreas)[i] = (MHCalibrationChargeHiGainPix*)(*fAverageHiGainAreas)[i]->Clone(); } for (int i=0; ifAverageLoGainArray)[i]; - (*cam->fAverageLoGainArray)[i] = (MHCalibrationChargeLoGainPix*)(*fAverageLoGainArray)[i]->Clone(); - } - - cam->fAverageNum = fAverageNum; - cam->fAverageSat = fAverageSat; - cam->fAveragePixSigma = fAveragePixSigma; - cam->fAveragePixSigmaErr = fAveragePixSigmaErr; - cam->fAveragePixRelSigma = fAveragePixRelSigma; - cam->fAveragePixRelSigmaErr = fAveragePixRelSigmaErr; + delete (*cam->fAverageLoGainAreas)[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->fAverageAreaSat = fAverageAreaSat; + cam->fAverageAreaSigma = fAverageAreaSigma; + cam->fAverageAreaSigmaErr = fAverageAreaSigmaErr; + cam->fAverageAreaRelSigma = fAverageAreaRelSigma; + cam->fAverageAreaRelSigmaErr = fAverageAreaRelSigmaErr; return cam; @@ -290,6 +346,9 @@ fLoGainArray->Delete(); - fAverageHiGainArray->Delete(); - fAverageLoGainArray->Delete(); + fAverageHiGainAreas->Delete(); + fAverageLoGainAreas->Delete(); + + fAverageHiGainSectors->Delete(); + fAverageLoGainSectors->Delete(); return kTRUE; @@ -364,7 +423,7 @@ const Int_t nareas = fGeom->GetNumAreas(); - if (fAverageHiGainArray->GetEntries()==0) + if (fAverageHiGainAreas->GetEntries()==0) { - fAverageHiGainArray->Expand(nareas); + fAverageHiGainAreas->Expand(nareas); for (Int_t j=0; jSetTitle("Summed FADC slices average Hi Gain pixels Area Idx "); @@ -389,7 +448,7 @@ } - if (fAverageLoGainArray->GetEntries()==0) + if (fAverageLoGainAreas->GetEntries()==0) { - fAverageLoGainArray->Expand(nareas); + fAverageLoGainAreas->Expand(nareas); for (Int_t j=0; jSetTitle("Summed FADC slices average Lo Gain pixels Area Idx "); @@ -414,10 +473,10 @@ } - fAverageNum. Set(nareas); - fAverageSat. Set(nareas); - fAveragePixSigma. Set(nareas); - fAveragePixSigmaErr. Set(nareas); - fAveragePixRelSigma. Set(nareas); - fAveragePixRelSigmaErr.Set(nareas); + fAverageAreaNum. Set(nareas); + fAverageAreaSat. Set(nareas); + fAverageAreaSigma. Set(nareas); + fAverageAreaSigmaErr. Set(nareas); + fAverageAreaRelSigma. Set(nareas); + fAverageAreaRelSigmaErr.Set(nareas); for (Int_t i=0; iGetNumSectors(); + + if (fAverageHiGainSectors->GetEntries()==0) + { + fAverageHiGainSectors->Expand(nsectors); + + for (Int_t j=0; jSetTitle("Summed FADC slices average Hi Gain pixels Sector "); + hist.GetHAbsTime()->SetTitle("Absolute Arrival Time average Hi Gain pixels Sector "); + hist.SetChargeFirst(-1000.); + hist.SetChargeLast(4000.); + hist.SetChargeNbins(4000); + hist.Init(); + hist.ChangeHistId(j); + hist.SetEventFrequency(fPulserFrequency); + } + } + + if (fAverageLoGainSectors->GetEntries()==0) + { + fAverageLoGainSectors->Expand(nsectors); + + for (Int_t j=0; jSetTitle("Summed FADC slices average Lo Gain pixels Sector "); + hist.GetHAbsTime()->SetTitle("Absolute Arrival Time average Lo Gain pixels Sector "); + hist.SetChargeFirst(-1000.); + hist.SetChargeLast(4000.); + hist.SetChargeNbins(4000); + hist.Init(); + hist.ChangeHistId(j); + hist.SetEventFrequency(fPulserFrequency); + } + } + + fAverageSectorNum. Set(nsectors); + + for (Int_t i=0; iGetSize(); - const Int_t lofirst = signal->GetFirstUsedSliceLoGain(); - const Int_t nareas = fGeom->GetNumAreas(); + const Int_t npixels = signal->GetSize(); + const Int_t lofirst = signal->GetFirstUsedSliceLoGain(); + const Int_t nareas = fGeom->GetNumAreas(); + const Int_t nsectors = fGeom->GetNumSectors(); if (fHiGainArray->GetEntries() != npixels) @@ -461,5 +586,5 @@ } - if (fAverageHiGainArray->GetEntries() != nareas) + if (fAverageHiGainAreas->GetEntries() != nareas) { *fLog << err << "ERROR - Size mismatch in number of areas ... abort." << endl; @@ -467,5 +592,5 @@ } - if (fAverageLoGainArray->GetEntries() != nareas) + if (fAverageLoGainAreas->GetEntries() != nareas) { *fLog << err << "ERROR - Size mismatch in number of areas ... abort." << endl; @@ -473,21 +598,27 @@ } - - // - // First the extracted signal - // - Float_t sumhitot [nareas]; - Float_t sumlotot [nareas]; - Int_t sumhisat [nareas]; - Int_t sumlosat [nareas]; - Float_t timehitot[nareas]; - Float_t timelotot[nareas]; + if (fAverageHiGainSectors->GetEntries() != nsectors) + { + *fLog << err << "ERROR - Size mismatch in number of sectors ... abort." << endl; + return kFALSE; + } + + if (fAverageLoGainSectors->GetEntries() != nsectors) + { + *fLog << err << "ERROR - Size mismatch in number of sectors ... abort." << endl; + return kFALSE; + } + + Float_t sumhiarea [nareas], sumloarea [nareas], timehiarea [nareas], timeloarea [nareas]; + Float_t sumhisector[nsectors], sumlosector[nsectors], timehisector[nsectors], timelosector[nsectors]; + Int_t sathiarea [nareas], satloarea [nareas]; + Int_t sathisector[nsectors], satlosector[nsectors]; for (UInt_t j=0; jGetSize(); j++) - { - - MHCalibrationChargeHiGainPix &histhi = GetAverageHiGainPix(j); - MCalibrationChargePix &pix = fCam->GetAveragePix(j); - MBadPixelsPix &bad = fCam->GetAverageBadPix(j); + for (Int_t j=0; jGetSize(); j++) + { + + MHCalibrationChargeHiGainPix &histhi = GetAverageHiGainArea(j); + MCalibrationChargePix &pix = fCam->GetAverageArea(j); + MBadPixelsPix &bad = fCam->GetAverageBadArea(j); FinalizeHiGainHists(histhi,pix,bad); } - for (Int_t j=0; jGetSize(); j++) - { - - MHCalibrationChargeLoGainPix &histlo = GetAverageLoGainPix(j); - MCalibrationChargePix &pix = fCam->GetAveragePix(j); - MBadPixelsPix &bad = fCam->GetAverageBadPix(j); + 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); + + FinalizeLoGainHists(histlo,pix,bad); + } for (Int_t j=0; jGetNumAreas();j++) { - MCalibrationChargePix &pix = fCam->GetAveragePix(j); + MCalibrationChargePix &pix = fCam->GetAverageArea(j); if (pix.IsHiGainSaturation()) - fAverageSat[j]++; - - fAveragePixSigma[j] = pix.GetSigmaCharge () * TMath::Sqrt((Float_t)fAverageNum[j]); - fAveragePixSigmaErr[j] = pix.GetSigmaChargeErr () * TMath::Sqrt((Float_t)fAverageNum[j]); - - pix.SetSigmaCharge (fAveragePixSigma[j]); - pix.SetSigmaChargeErr(fAveragePixSigmaErr[j]); - - fAveragePixRelSigma[j] = fAveragePixSigma[j] / pix.GetMeanCharge(); - - Float_t relsigmaerr = fAveragePixSigmaErr[j]*fAveragePixSigmaErr[j] - / (fAveragePixSigma[j] *fAveragePixSigma[j] ); - relsigmaerr += pix.GetMeanChargeErr()*pix.GetMeanChargeErr() - / (pix.GetMeanCharge() *pix.GetMeanCharge() ); - relsigmaerr *= fAveragePixRelSigma[j]; - fAveragePixRelSigmaErr[j] = TMath::Sqrt(relsigmaerr); + fAverageAreaSat[j]++; + + fAverageAreaSigma[j] = pix.GetSigmaCharge () * TMath::Sqrt((Float_t)fAverageAreaNum[j]); + fAverageAreaSigmaErr[j] = pix.GetSigmaChargeErr () * TMath::Sqrt((Float_t)fAverageAreaNum[j]); + + pix.SetSigmaCharge (fAverageAreaSigma[j]); + pix.SetSigmaChargeErr(fAverageAreaSigmaErr[j]); + + fAverageAreaRelSigma[j] = fAverageAreaSigma[j] / pix.GetMeanCharge(); + + Float_t relsigmaerr = fAverageAreaSigmaErr[j]*fAverageAreaSigmaErr[j] + / (fAverageAreaSigma[j] *fAverageAreaSigma[j] ); + relsigmaerr += pix.GetMeanChargeErr()*pix.GetMeanChargeErr() + / (pix.GetMeanCharge() *pix.GetMeanCharge() ); + relsigmaerr *= fAverageAreaRelSigma[j]; + fAverageAreaRelSigmaErr[j] = TMath::Sqrt(relsigmaerr); } @@ -668,5 +848,5 @@ *fLog << warn << "Saturated Hi Gain histogram in pixel: " << pix.GetPixId() << endl; pix.SetHiGainSaturation(); - return; + // return; } @@ -737,5 +917,5 @@ bad.SetUncalibrated( MBadPixelsPix::kLoGainSaturation ); bad.SetUnsuitable( MBadPixelsPix::kUnsuitableRun ); - return; + // return; } @@ -810,5 +990,5 @@ { - const Int_t nareas = fAverageHiGainArray->GetEntries(); + const Int_t nareas = fAverageHiGainAreas->GetEntries(); if (nareas == 0) return; @@ -822,18 +1002,18 @@ { pad->cd(2*(i+1)-1); - GetAverageHiGainPix(i).Draw(opt); - - if (!fAverageSat[i]) - DrawAverageSigma(fAverageSat[i], i, - fAveragePixSigma[i], fAveragePixSigmaErr[i], - fAveragePixRelSigma[i], fAveragePixRelSigmaErr[i]); + GetAverageHiGainArea(i).Draw(opt); + + if (!fAverageAreaSat[i]) + DrawAverageSigma(fAverageAreaSat[i], i, + fAverageAreaSigma[i], fAverageAreaSigmaErr[i], + fAverageAreaRelSigma[i], fAverageAreaRelSigmaErr[i]); pad->cd(2*(i+1)); - GetAverageLoGainPix(i).Draw(opt); - - if (fAverageSat[i]) - DrawAverageSigma(fAverageSat[i], i, - fAveragePixSigma[i], fAveragePixSigmaErr[i], - fAveragePixRelSigma[i], fAveragePixRelSigmaErr[i]); + GetAverageLoGainArea(i).Draw(opt); + + if (fAverageAreaSat[i]) + DrawAverageSigma(fAverageAreaSat[i], i, + fAverageAreaSigma[i], fAverageAreaSigmaErr[i], + fAverageAreaRelSigma[i], fAverageAreaRelSigmaErr[i]); } } Index: /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.h =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.h (revision 3623) +++ /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.h (revision 3624) @@ -47,7 +47,9 @@ TObjArray *fHiGainArray; //-> Array of MHCalibrationChargeHiGainPix, one per pixel TObjArray *fLoGainArray; //-> Array of MHCalibrationChargeLoGainPix, one per pixel - TObjArray *fAverageHiGainArray; //-> Array of MHCalibrationChargeHiGainPix, one per pixel area - TObjArray *fAverageLoGainArray; //-> Array of MHCalibrationChargeLoGainPix, one per pixel area - + 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 @@ -55,10 +57,12 @@ MBadPixelsCam *fBadPixels; //! Bad Pixels storage container - TArrayI fAverageNum; // Number of pixels in average pixels - TArrayI fAverageSat; // Number of saturated slices in average pixels - TArrayF fAveragePixSigma; // Re-normalized sigmas in average pixels - TArrayF fAveragePixSigmaErr; // Errors of Re-normalized sigmas in average pixels - TArrayF fAveragePixRelSigma; // Re-normalized relative sigmas in average pixels - TArrayF fAveragePixRelSigmaErr; // Errors of Re-normalized relative sigmas in average pixels + 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 + + TArrayI fAverageSectorNum; // Number of pixels in average pixels per sector void FinalizeHiGainHists(MHCalibrationChargeHiGainPix &hist, MCalibrationChargePix &pix, MBadPixelsPix &bad); @@ -86,9 +90,15 @@ const MHCalibrationChargeLoGainPix &operator()(UInt_t i) const; - MHCalibrationChargeHiGainPix &GetAverageHiGainPix(UInt_t i); - const MHCalibrationChargeHiGainPix &GetAverageHiGainPix(UInt_t i) const; + MHCalibrationChargeHiGainPix &GetAverageHiGainArea(UInt_t i); + const MHCalibrationChargeHiGainPix &GetAverageHiGainArea(UInt_t i) const; - MHCalibrationChargeLoGainPix &GetAverageLoGainPix(UInt_t i); - const MHCalibrationChargeLoGainPix &GetAverageLoGainPix(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; Bool_t SetupFill(const MParList *pList); @@ -106,5 +116,5 @@ void DrawPixelContent( Int_t num ) const; - ClassDef(MHCalibrationChargeCam, 1) // Container for calibration information of the camera + ClassDef(MHCalibrationChargeCam, 1) // Histogram class for camera calibration };