Index: /trunk/MagicSoft/Mars/Changelog =================================================================== --- /trunk/MagicSoft/Mars/Changelog (revision 4913) +++ /trunk/MagicSoft/Mars/Changelog (revision 4914) @@ -22,4 +22,14 @@ 2004/09/09: Markus Gaug + * mcalib/MHCalibrationChargeCam.[h,cc] + - initialize bins directly here. Remove MHCalibraitonChargeHiGainPix + and MHCalibrationChargeLoGainPix classes + + * mcalib/MHCalibrationChargeHiGainPix.[h,cc] + * mcalib/MHCalibrationChargeLoGainPix.[h,cc] + * mcalib/Makefile + * mcalib/CalibLinkDef.h + - removed first two classes + * mcalib/MCalibrationCam.[h,cc] - make default for GetNumUnsuitable and GetNumUnreliable Index: /trunk/MagicSoft/Mars/mcalib/CalibLinkDef.h =================================================================== --- /trunk/MagicSoft/Mars/mcalib/CalibLinkDef.h (revision 4913) +++ /trunk/MagicSoft/Mars/mcalib/CalibLinkDef.h (revision 4914) @@ -41,6 +41,4 @@ #pragma link C++ class MHCalibrationChargeCam+; #pragma link C++ class MHCalibrationChargePix+; -#pragma link C++ class MHCalibrationChargeHiGainPix+; -#pragma link C++ class MHCalibrationChargeLoGainPix+; #pragma link C++ class MHCalibrationChargeBlindCam+; #pragma link C++ class MHCalibrationChargeBlindPix+; Index: /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc (revision 4913) +++ /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc (revision 4914) @@ -117,6 +117,4 @@ #include "MParList.h" -#include "MHCalibrationChargeHiGainPix.h" -#include "MHCalibrationChargeLoGainPix.h" #include "MHCalibrationChargePix.h" #include "MHCalibrationPix.h" @@ -156,6 +154,9 @@ using namespace std; -const Int_t MHCalibrationChargeCam::fgAverageNbinsHiGain = 3300; -const Int_t MHCalibrationChargeCam::fgAverageNbinsLoGain = 1950; +const Axis_t MHCalibrationChargeCam::fgChargeHiGainFirst = -100.5; +const Axis_t MHCalibrationChargeCam::fgChargeHiGainLast = 999.5; +const Axis_t MHCalibrationChargeCam::fgChargeLoGainFirst = -150.5; +const Axis_t MHCalibrationChargeCam::fgChargeLoGainLast = 499.5; + const Float_t MHCalibrationChargeCam::fgNumHiGainSaturationLimit = 0.01; const Float_t MHCalibrationChargeCam::fgNumLoGainSaturationLimit = 0.005; @@ -179,5 +180,4 @@ // - fTimeLowerLimit to fgTimeLowerLimit // - fTimeUpperLimit to fgTimeUpperLimit -// - fAverageNbins to fgAverageNbinsHiGain // MHCalibrationChargeCam::MHCalibrationChargeCam(const char *name, const char *title) @@ -193,5 +193,4 @@ SetTimeUpperLimit(); - SetAverageNbins(fgAverageNbinsHiGain); } @@ -242,8 +241,4 @@ // - MHCalibrationCam::fAverageHiGainAreas // - MHCalibrationCam::fAverageHiGainSectors -// -// Sets number of bins to MHCalibrationCam::fAverageNbins for: -// - MHCalibrationCam::fAverageHiGainAreas, MHCalibrationCam::fAverageLoGainAreas -// - MHCalibrationCam::fAverageHiGainSectors, MHCalibrationCam::fAverageLoGainSectors // Bool_t MHCalibrationChargeCam::ReInitHists(MParList *pList) @@ -321,8 +316,21 @@ for (Int_t i=0; iSetName ("HCalibrationChargeHiGainPix"); + pix.GetHGausHist()->SetTitle("Summed Hi Gain FADC slices Pixel "); + + pix.GetHAbsTime()->SetName ("HAbsTimeHiGainPix"); + pix.GetHAbsTime()->SetTitle("Absolute Arrival Times Hi Gain Pixel "); + InitHists((*this)[i],(*fBadPixels)[i],i); } @@ -335,6 +343,21 @@ for (Int_t i=0; iSetName ("HCalibrationChargeLoGainPix"); + pix.GetHGausHist()->SetTitle("Summed Lo Gain FADC slices Pixel "); + + pix.GetHAbsTime()->SetName ("HAbsTimeLoGainPix"); + pix.GetHAbsTime()->SetTitle("Absolute Arrival Times Lo Gain Pixel "); + // // Adapt the range for the case, the intense blue is used: @@ -346,11 +369,9 @@ if ( fColor == MCalibrationCam::kBLUE) { - lopix.SetLast(999.5); - lopix.SetNbins(1150); + pix.SetLast(999.5); + pix.SetNbins((Int_t)(999.5-fgChargeLoGainFirst)); } } - ((MHCalibrationChargePix&)(*this)(i)).SetAbsTimeNbins(logainsamples); - ((MHCalibrationChargePix&)(*this)(i)).SetAbsTimeLast(logainsamples-0.5); - InitHists(lopix,(*fBadPixels)[i],i); + InitHists(pix,(*fBadPixels)[i],i); } } @@ -362,24 +383,33 @@ for (Int_t j=0; jSetTitle("Absolute Arrival Time average HiGain Area Idx "); + (*fAverageHiGainAreas)[j] = new MHCalibrationChargePix("ChargeAverageHiGainArea", + "Average HiGain FADC sums area idx "); + + MHCalibrationChargePix &pix = (MHCalibrationChargePix&)GetAverageHiGainArea(j); + + pix.SetAbsTimeNbins(higainsamples); + pix.SetAbsTimeFirst(-0.5); + pix.SetAbsTimeLast(higainsamples-0.5); + + pix.SetNbins((Int_t)(fgChargeHiGainLast-fgChargeHiGainFirst)*3); + pix.SetFirst(fgChargeHiGainFirst); + pix.SetLast(fgChargeHiGainLast); + + pix.GetHGausHist()->SetName ("HCalibrationChargeHiGainAreaIdx"); + pix.GetHGausHist()->SetTitle("Signal averaged on event-by-event basis High Gain Area Idx "); + + pix.GetHAbsTime()->SetName ("HAbsTimeHiGainAreaIdx"); + pix.GetHAbsTime()->SetTitle("Absolute Arrival Times average Hi Gain Area Idx "); if (fGeom->InheritsFrom("MGeomCamMagic")) { - hist.GetHGausHist()->SetTitle(Form("%s%s%s","Signal averaged on event-by-event basis ", + pix.GetHGausHist()->SetTitle(Form("%s%s%s","Signal averaged on event-by-event basis ", j==0 ? "Inner Pixels " : "Outer Pixels ","High Gain Runs: ")); - hist.InitBins(); - hist.SetEventFrequency(fPulserFrequency); + pix.InitBins(); + pix.SetEventFrequency(fPulserFrequency); } else { - hist.GetHGausHist()->SetTitle("Signal averaged on event-by-event basis High Gain Area Idx "); - InitHists(hist,fIntensCam ? fIntensCam->GetAverageBadArea(j) : fCam->GetAverageBadArea(j),j); + InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadArea(j) : fCam->GetAverageBadArea(j),j); } } @@ -393,10 +423,22 @@ for (Int_t j=0; jSetName ("HChargeLoGainAreaIdx"); + pix.GetHGausHist()->SetTitle("Signal averaged on event-by-event basis Low Gain Area Idx "); + + pix.GetHAbsTime()->SetName ("HAbsTimeLoGainAreaIdx"); + pix.GetHAbsTime()->SetTitle("Absolute Arrival Times average Lo Gain Area Idx "); // @@ -409,23 +451,20 @@ if ( fColor == MCalibrationCam::kBLUE) { - hist.SetFirst(-10.5); - hist.SetLast(999.5); - hist.SetNbins(3030); + pix.SetFirst(-10.5); + pix.SetLast(999.5); + pix.SetNbins(3030); } } - hist.GetHAbsTime()->SetTitle("Absolute Arrival Time average LoGain Area Idx "); - if (fGeom->InheritsFrom("MGeomCamMagic")) { - hist.GetHGausHist()->SetTitle(Form("%s%s%s","Signal averaged on event-by-event basis ", + pix.GetHGausHist()->SetTitle(Form("%s%s%s","Signal averaged on event-by-event basis ", j==0 ? "Inner Pixels " : "Outer Pixels ","Low Gain Runs: ")); - hist.InitBins(); - hist.SetEventFrequency(fPulserFrequency); + pix.InitBins(); + pix.SetEventFrequency(fPulserFrequency); } else { - hist.GetHGausHist()->SetTitle("Signal averaged on event-by-event basis Low Gain Area Idx "); - InitHists(hist,fIntensCam ? fIntensCam->GetAverageBadArea(j) : fCam->GetAverageBadArea(j),j); + InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadArea(j) : fCam->GetAverageBadArea(j),j); } } @@ -438,15 +477,24 @@ for (Int_t j=0; jSetTitle("Signals averaged on event-by-event basis HiGain Sector "); - hist.SetNbins(fAverageNbins); - hist.GetHAbsTime()->SetTitle("Absolute Arrival Time average HiGain Sector "); - - InitHists(hist,fIntensCam ? fIntensCam->GetAverageBadSector(j) : fCam->GetAverageBadSector(j),j); + (*fAverageHiGainSectors)[j] = new MHCalibrationChargePix("ChargeAverageHiGainSector", + "Averaged HiGain Signals Sector "); + + MHCalibrationChargePix &pix = (MHCalibrationChargePix&)GetAverageHiGainSector(j); + + pix.SetAbsTimeNbins(higainsamples); + pix.SetAbsTimeFirst(-0.5); + pix.SetAbsTimeLast(higainsamples-0.5); + + pix.SetNbins((Int_t)(fgChargeHiGainLast-fgChargeHiGainFirst)*3); + pix.SetFirst(fgChargeHiGainFirst); + pix.SetLast(fgChargeHiGainLast); + + pix.GetHGausHist()->SetName ("HCalibrationChargeHiGainPix"); + pix.GetHGausHist()->SetTitle("Signals averaged on event-by-event basis HiGain Sector "); + + pix.GetHAbsTime()->SetName ("HAbsTimeHiGainPix"); + pix.GetHAbsTime()->SetTitle("Absolute Arrival Time average HiGain Sector "); + + InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadSector(j) : fCam->GetAverageBadSector(j),j); } } @@ -458,13 +506,23 @@ for (Int_t j=0; jSetTitle("Signals averaged on event-by-event basis LoGain Sector "); - hist.SetNbins(fgAverageNbinsLoGain); + (*fAverageLoGainSectors)[j] = new MHCalibrationChargePix("ChargeAverageLoGainSector", + "Average LoGain Signals Sector "); + + MHCalibrationChargePix &pix = (MHCalibrationChargePix&)GetAverageLoGainSector(j); + + pix.SetAbsTimeNbins(logainsamples); + pix.SetAbsTimeFirst(-0.5); + pix.SetAbsTimeLast(logainsamples-0.5); + pix.SetNbins((Int_t)(fgChargeLoGainLast-fgChargeLoGainFirst)*3); + pix.SetFirst(fgChargeLoGainFirst); + pix.SetLast(fgChargeLoGainLast); + + pix.GetHGausHist()->SetName ("HCalibrationChargeLoGainPix"); + pix.GetHGausHist()->SetTitle("Signals averaged on event-by-event basis LoGain Sector "); + + pix.GetHAbsTime()->SetName ("HAbsTimeLoGainPix"); + pix.GetHAbsTime()->SetTitle("Absolute Arrival Time average LoGain Sector "); + // // Adapt the range for the case, the intense blue is used: @@ -476,13 +534,11 @@ if ( fColor == MCalibrationCam::kBLUE) { - hist.SetFirst(-10.5); - hist.SetLast(999.5); - hist.SetNbins(3030); + pix.SetFirst(-10.5); + pix.SetLast(999.5); + pix.SetNbins(3030); } } - hist.GetHAbsTime()->SetTitle("Absolute Arrival Time average LoGain Sector "); - - InitHists(hist,fIntensCam ? fIntensCam->GetAverageBadSector(j) : fCam->GetAverageBadSector(j),j); + InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadSector(j) : fCam->GetAverageBadSector(j),j); } } @@ -1108,5 +1164,4 @@ cam->fColor = fColor; cam->fPulserFrequency = fPulserFrequency; - cam->fAverageNbins = fAverageNbins; return cam; Index: /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.h =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.h (revision 4913) +++ /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.h (revision 4914) @@ -24,7 +24,9 @@ private: - static const Int_t fgAverageNbinsHiGain; //! The default for fAverageNbins HiGain (now set to: 3300) - static const Int_t fgAverageNbinsLoGain; //! The default for fAverageNbins LoGain (now set to: 1950) - + static const Axis_t fgChargeHiGainFirst; //! First Bin of HiGain Histograms (nw set to: -100.5) + static const Axis_t fgChargeHiGainLast; //! Last Bin of HiGain Histograms (nw set to: 999.5) + static const Axis_t fgChargeLoGainFirst; //! First Bin of LoGain Histograms (nw set to: -150.5) + static const Axis_t fgChargeLoGainLast; //! Last Bin of LoGain Histograms (nw set to: 499.5) + static const Float_t fgNumHiGainSaturationLimit; //! The default for fNumHiGainSaturationLimit (now at: 0.01) static const Float_t fgNumLoGainSaturationLimit; //! The default for fNumLoGainSaturationLimit (now at: 0.005) Index: unk/MagicSoft/Mars/mcalib/MHCalibrationChargeHiGainPix.cc =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeHiGainPix.cc (revision 4913) +++ (revision ) @@ -1,86 +1,0 @@ -/* ======================================================================== *\ -! -! * -! * 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 -! -! -\* ======================================================================== */ - -////////////////////////////////////////////////////////////////////////////// -// -// MHCalibrationChargeHiGainPix -// -// Histogram class for the charge High Gain FADC calibration. -// Stores and fits the charges and stores the location of the maximum FADC -// slice. Charges are taken from MExtractedSignalPix. -// -////////////////////////////////////////////////////////////////////////////// -#include "MHCalibrationChargeHiGainPix.h" - -#include - -ClassImp(MHCalibrationChargeHiGainPix); - -using namespace std; - -const Int_t MHCalibrationChargeHiGainPix::fgChargeNbins = 1100; -const Axis_t MHCalibrationChargeHiGainPix::fgChargeFirst = -100.5; -const Axis_t MHCalibrationChargeHiGainPix::fgChargeLast = 999.5; -const Int_t MHCalibrationChargeHiGainPix::fgAbsTimeNbins = 20; -const Axis_t MHCalibrationChargeHiGainPix::fgAbsTimeFirst = -0.5; -const Axis_t MHCalibrationChargeHiGainPix::fgAbsTimeLast = 19.5; - -// -------------------------------------------------------------------------- -// -// Default Constructor. -// -// Sets: -// - the default number for fNbins (fgChargeNbins) -// - the default number for fFirst (fgChargeFirst) -// - the default number for fLast (fgChargeLast) -// - the default number for fAbsTimeNbins (fgAbstTimeNbins) -// - the default number for fAbsTimeFirst (fgAbsTimeFirst) -// - the default number for fAbsTimeLast (fgAbsTimeLast) -// -// - the default name of the fHGausHist ("HCalibrationChargeHiGainPix") -// - the default title of the fHGausHist ("Distribution of Summed Hi Gain FADC slices Pixel ") -// -// - the default name of the fHAbsTime ("HAbsTimeHiGainPix") -// - the default title of the fHAbsTime ("Distribution of Absolute Arrival Times Hi Gain Pixel ") -// -MHCalibrationChargeHiGainPix::MHCalibrationChargeHiGainPix(const char *name, const char *title) -{ - - fName = name ? name : "MHCalibrationChargeHiGainPix"; - fTitle = title ? title : "Fill the FADC sums of the HiGainPix events and perform the fits Pixel "; - - SetNbins ( fgChargeNbins ); - SetFirst ( fgChargeFirst ); - SetLast ( fgChargeLast ); - - SetAbsTimeNbins(); - SetAbsTimeFirst(); - SetAbsTimeLast(); - - fHGausHist.SetName ("HCalibrationChargeHiGainPix"); - fHGausHist.SetTitle("Distribution of Summed Hi Gain FADC slices Pixel "); - - fHAbsTime.SetName ("HAbsTimeHiGainPix"); - fHAbsTime.SetTitle("Distribution of Absolute Arrival Times Hi Gain Pixel "); -} Index: unk/MagicSoft/Mars/mcalib/MHCalibrationChargeHiGainPix.h =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeHiGainPix.h (revision 4913) +++ (revision ) @@ -1,39 +1,0 @@ -#ifndef MARS_MHCalibrationChargeHiGainPix -#define MARS_MHCalibrationChargeHiGainPix - - -#ifndef MARS_MHCalibrationChargePix -#include "MHCalibrationChargePix.h" -#endif - -class MHCalibrationChargeHiGainPix : public MHCalibrationChargePix -{ -private: - - static const Int_t fgChargeNbins; //! Default for fNbins (now set to: 1100 ) - static const Axis_t fgChargeFirst; //! Default for fFirst (now set to: -100.5 ) - static const Axis_t fgChargeLast; //! Default for fLast (now set to: 999.5) - static const Int_t fgAbsTimeNbins; //! Default for fAbsTimeNbins (now set to: 20 ) - static const Axis_t fgAbsTimeFirst; //! Default for fAbsTimeFirst (now set to: -0.5 ) - static const Axis_t fgAbsTimeLast; //! Default for fAbsTimeLast (now set to: 19.5 ) - -public: - - MHCalibrationChargeHiGainPix(const char *name=NULL, const char *title=NULL); - ~MHCalibrationChargeHiGainPix(){} - - // Setters - void SetAbsTimeNbins(const Int_t bins =fgAbsTimeNbins) { fAbsTimeNbins = bins; } - void SetAbsTimeFirst(const Axis_t first=fgAbsTimeFirst) { fAbsTimeFirst = first; } - void SetAbsTimeLast (const Axis_t last =fgAbsTimeLast) { fAbsTimeLast = last; } - - ClassDef(MHCalibrationChargeHiGainPix, 1) // Histogram class for Charge High Gain Pixel Calibration -}; - -#endif - - - - - - Index: unk/MagicSoft/Mars/mcalib/MHCalibrationChargeLoGainPix.cc =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeLoGainPix.cc (revision 4913) +++ (revision ) @@ -1,92 +1,0 @@ -/* ======================================================================== *\ -! -! * -! * 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 -! -! -\* ======================================================================== */ - -////////////////////////////////////////////////////////////////////////////// -// -// MHCalibrationChargeLoGainPix -// -// Histogram class for the charge Low Gain FADC calibration. -// Stores and fits the charges and stores the location of the maximum FADC -// slice. Charges are taken from MExtractedSignalPix. -// -////////////////////////////////////////////////////////////////////////////// -#include "MHCalibrationChargeLoGainPix.h" - -#include - -ClassImp(MHCalibrationChargeLoGainPix); - -using namespace std; - -const Int_t MHCalibrationChargeLoGainPix::fgChargeNbins = 650; -const Axis_t MHCalibrationChargeLoGainPix::fgChargeFirst = -150.5; -const Axis_t MHCalibrationChargeLoGainPix::fgChargeLast = 499.5; -const Int_t MHCalibrationChargeLoGainPix::fgAbsTimeNbins = 15; -const Axis_t MHCalibrationChargeLoGainPix::fgAbsTimeFirst = -0.5; -const Axis_t MHCalibrationChargeLoGainPix::fgAbsTimeLast = 14.5; -// -------------------------------------------------------------------------- -// -// Default Constructor. -// -// Sets: -// - the default number for fNbins (fgChargeNbins) -// - the default number for fFirst (fgChargeFirst) -// - the default number for fLast (fgChargeLast) -// - the default number for fAbsTimeNbins (fgAbstTimeNbins) -// - the default number for fAbsTimeFirst (fgAbsTimeFirst) -// - the default number for fAbsTimeLast (fgAbsTimeLast) -// -// - the default name of the fHGausHist ("HCalibrationChargeLoGainPix") -// - the default title of the fHGausHist ("Distribution of Summed Lo Gain FADC slices Pixel ") -// -// - the default name of the fHAbsTime ("HAbsTimeLoGainPix") -// - the default title of the fHAbsTime ("Distribution of Absolute Arrival Times Lo Gain Pixel ") -// -MHCalibrationChargeLoGainPix::MHCalibrationChargeLoGainPix(const char *name, const char *title) -{ - - fName = name ? name : "MHCalibrationChargeLoGainPix"; - fTitle = title ? title : "Fill the FADC sums of the Low Gain events and perform the fits Pixel "; - - SetNbins ( fgChargeNbins ); - SetFirst ( fgChargeFirst ); - SetLast ( fgChargeLast ); - - SetAbsTimeNbins(); - SetAbsTimeFirst(); - SetAbsTimeLast(); - - fHGausHist.SetName ("HCalibrationChargeLoGainPix"); - fHGausHist.SetTitle("Distribution of Summed Lo Gain FADC slices Pixel "); - - fHAbsTime.SetName ("HAbsTimeLoGainPix"); - fHAbsTime.SetTitle("Distribution of Absolute Arrival Times Lo Gain Pixel "); - -} - - - - - - Index: unk/MagicSoft/Mars/mcalib/MHCalibrationChargeLoGainPix.h =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeLoGainPix.h (revision 4913) +++ (revision ) @@ -1,41 +1,0 @@ -#ifndef MARS_MHCalibrationChargeLoGainPix -#define MARS_MHCalibrationChargeLoGainPix - - -#ifndef MARS_MHCalibrationChargePix -#include "MHCalibrationChargePix.h" -#endif - -class MHCalibrationChargeLoGainPix : public MHCalibrationChargePix -{ -private: - - static const Int_t fgChargeNbins; //! Default for fNbins (now set to: 650 ) - static const Axis_t fgChargeFirst; //! Default for fFirst (now set to: -150.5 ) - static const Axis_t fgChargeLast; //! Default for fLast (now set to: 499.5 ) - static const Int_t fgAbsTimeNbins; //! Default for fAbsTimeNbins (now set to: 15 ) - static const Axis_t fgAbsTimeFirst; //! Default for fAbsTimeFirst (now set to: -0.5 ) - static const Axis_t fgAbsTimeLast; //! Default for fAbsTimeLast (now set to: 14.5 ) - -public: - - MHCalibrationChargeLoGainPix(const char *name=NULL, const char *title=NULL); - ~MHCalibrationChargeLoGainPix(){} - - // Setters - void SetAbsTimeNbins(const Int_t bins =fgAbsTimeNbins) { fAbsTimeNbins = bins; } - void SetAbsTimeFirst(const Axis_t first=fgAbsTimeFirst) { fAbsTimeFirst = first; } - void SetAbsTimeLast (const Axis_t last =fgAbsTimeLast) { fAbsTimeLast = last; } - - ClassDef(MHCalibrationChargeLoGainPix, 1) // Histogram class for Charge Low Gain Pixel Calibration -}; - -#endif - - - - - - - - Index: /trunk/MagicSoft/Mars/mcalib/Makefile =================================================================== --- /trunk/MagicSoft/Mars/mcalib/Makefile (revision 4913) +++ /trunk/MagicSoft/Mars/mcalib/Makefile (revision 4914) @@ -66,6 +66,4 @@ MHCalibrationPix.cc \ MHCalibrationChargeCam.cc \ - MHCalibrationChargeHiGainPix.cc \ - MHCalibrationChargeLoGainPix.cc \ MHCalibrationChargePINDiode.cc \ MHCalibrationRelTimeCam.cc \