Index: /trunk/MagicSoft/Mars/mhcalib/HCalibLinkDef.h =================================================================== --- /trunk/MagicSoft/Mars/mhcalib/HCalibLinkDef.h (revision 4937) +++ /trunk/MagicSoft/Mars/mhcalib/HCalibLinkDef.h (revision 4938) @@ -12,5 +12,4 @@ #pragma link C++ class MHCalibrationChargeBlindPix+; #pragma link C++ class MHCalibrationChargePINDiode+; -#pragma link C++ class MHCalibrationRelTimePix+; #pragma link C++ class MHCalibrationRelTimeCam+; #pragma link C++ class MHCalibrationTestCam+; Index: /trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc =================================================================== --- /trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc (revision 4937) +++ /trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc (revision 4938) @@ -327,9 +327,9 @@ pix.SetLast (fgChargeHiGainLast); - pix.GetHGausHist()->SetName ("HCalibrationChargeHiGainPix"); - pix.GetHGausHist()->SetTitle("Summed Hi Gain FADC slices Pixel "); + pix.GetHGausHist()->SetName ("HChargeHiGainPix"); + pix.GetHGausHist()->SetTitle("Signals High Gain Pixel "); pix.GetHAbsTime()->SetName ("HAbsTimeHiGainPix"); - pix.GetHAbsTime()->SetTitle("Absolute Arrival Times Hi Gain Pixel "); + pix.GetHAbsTime()->SetTitle("Absolute Arrival Times High Gain Pixel "); InitHists((*this)[i],(*fBadPixels)[i],i); @@ -354,9 +354,9 @@ pix.SetLast (fgChargeLoGainLast); - pix.GetHGausHist()->SetName ("HCalibrationChargeLoGainPix"); - pix.GetHGausHist()->SetTitle("Summed Lo Gain FADC slices Pixel "); + pix.GetHGausHist()->SetName ("HChargeLoGainPix"); + pix.GetHGausHist()->SetTitle("Signals Low Gain Pixel "); pix.GetHAbsTime()->SetName ("HAbsTimeLoGainPix"); - pix.GetHAbsTime()->SetTitle("Absolute Arrival Times Lo Gain Pixel "); + pix.GetHAbsTime()->SetTitle("Absolute Arrival Times Low Gain Pixel "); // @@ -396,6 +396,6 @@ pix.SetLast (fgChargeHiGainLast); - pix.GetHGausHist()->SetName ("HCalibrationChargeHiGainAreaIdx"); - pix.GetHGausHist()->SetTitle("Signal averaged on event-by-event basis High Gain Area Idx "); + pix.GetHGausHist()->SetName ("HChargeHiGainAreaIdx"); + pix.GetHGausHist()->SetTitle("Signals averaged on event-by-event basis High Gain Area Idx "); pix.GetHAbsTime()->SetName ("HAbsTimeHiGainAreaIdx"); @@ -404,5 +404,5 @@ if (fGeom->InheritsFrom("MGeomCamMagic")) { - pix.GetHGausHist()->SetTitle(Form("%s%s%s","Signal averaged on event-by-event basis ", + pix.GetHGausHist()->SetTitle(Form("%s%s%s","Signals averaged on event-by-event basis ", j==0 ? "Inner Pixels " : "Outer Pixels ","High Gain Runs: ")); pix.InitBins(); @@ -437,8 +437,8 @@ pix.GetHGausHist()->SetName ("HChargeLoGainAreaIdx"); - pix.GetHGausHist()->SetTitle("Signal averaged on event-by-event basis Low Gain Area Idx "); + pix.GetHGausHist()->SetTitle("Signals 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 "); + pix.GetHAbsTime()->SetTitle("Absolute Arrival Times average Low Gain Area Idx "); // @@ -459,5 +459,5 @@ if (fGeom->InheritsFrom("MGeomCamMagic")) { - pix.GetHGausHist()->SetTitle(Form("%s%s%s","Signal averaged on event-by-event basis ", + pix.GetHGausHist()->SetTitle(Form("%s%s%s","Signals averaged on event-by-event basis ", j==0 ? "Inner Pixels " : "Outer Pixels ","Low Gain Runs: ")); pix.InitBins(); @@ -490,5 +490,5 @@ pix.SetLast (fgChargeHiGainLast); - pix.GetHGausHist()->SetName ("HCalibrationChargeHiGainPix"); + pix.GetHGausHist()->SetName ("HChargeHiGainPix"); pix.GetHGausHist()->SetTitle("Signals averaged on event-by-event basis HiGain Sector "); @@ -519,5 +519,5 @@ pix.SetLast (fgChargeLoGainLast); - pix.GetHGausHist()->SetName ("HCalibrationChargeLoGainPix"); + pix.GetHGausHist()->SetName ("HChargeLoGainPix"); pix.GetHGausHist()->SetTitle("Signals averaged on event-by-event basis LoGain Sector "); @@ -713,5 +713,5 @@ hipix.FillHist(fSumhiarea[j]/npix); - hipix.SetSaturated (fSathiarea [j]/npix); + hipix.SetSaturated ((Float_t)fSathiarea [j]/npix > 0.5 ? 1 : 0); hipix.FillAbsTime (fTimehiarea[j]/npix); @@ -723,5 +723,5 @@ else lopix.FillHist(fSumloarea [j]/npix); - lopix.SetSaturated (fSatloarea [j]/npix); + lopix.SetSaturated ((Float_t)fSatloarea [j]/npix > 0.5 ? 1 : 0); lopix.FillAbsTime (fTimeloarea[j]/npix); } @@ -743,5 +743,5 @@ hipix.FillHist(fSumhisector [j]/npix); - hipix.SetSaturated (fSathisector [j]/npix); + hipix.SetSaturated ((Float_t)fSathisector[j]/npix > 0.5 ? 1 : 0); hipix.FillAbsTime (fTimehisector[j]/npix); @@ -755,5 +755,5 @@ lopix.FillHist(fSumlosector [j]/npix); - lopix.SetSaturated (fSatlosector [j]/npix); + lopix.SetSaturated ((Float_t)fSatlosector[j]/npix > 0.5 ? 1 : 0); lopix.FillAbsTime (fTimelosector[j]/npix); } Index: /trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargePix.cc =================================================================== --- /trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargePix.cc (revision 4937) +++ /trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargePix.cc (revision 4938) @@ -116,4 +116,21 @@ Clear(); +} + +// -------------------------------------------------------------------------- +// +// Use the MHGausEvents::Clone function and clone additionally the rest of the +// data members. +// +TObject *MHCalibrationChargePix::Clone(const char *name) const +{ + + MHCalibrationChargePix &pix = (MHCalibrationChargePix&)*MHCalibrationPix::Clone(name); + // + // Copy data members + // + pix.fHAbsTime = fHAbsTime; + + return &pix; } Index: /trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc =================================================================== --- /trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc (revision 4937) +++ /trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc (revision 4938) @@ -27,5 +27,5 @@ // // Fills the extracted relative arrival times of MArrivalTimeCam into -// the MHCalibrationPix-classes MHCalibrationRelTimePix for every: +// the MHCalibrationPix-classes MHCalibrationPix for every: // // - Pixel, stored in the TObjArray's MHCalibrationCam::fHiGainArray @@ -86,6 +86,4 @@ ///////////////////////////////////////////////////////////////////////////// #include "MHCalibrationRelTimeCam.h" -#include "MHCalibrationRelTimePix.h" - #include "MHCalibrationPix.h" @@ -116,4 +114,7 @@ const Float_t MHCalibrationRelTimeCam::fgNumHiGainSaturationLimit = 0.25; const UInt_t MHCalibrationRelTimeCam::fgReferencePixel = 1; +const Int_t MHCalibrationRelTimeCam::fgRelTimeNbins = 900; +const Axis_t MHCalibrationRelTimeCam::fgRelTimeFirst = -5.; +const Axis_t MHCalibrationRelTimeCam::fgRelTimeLast = 5.; // -------------------------------------------------------------------------- // @@ -122,4 +123,7 @@ // Sets: // - fReferencePixel to fgReferencePixel +// - fRelTimeNbins to fgRelTimeNbins +// - fRelTimeFirst to fgRelTimeFirst +// - fRelTimeLast to fgRelTimeLast // MHCalibrationRelTimeCam::MHCalibrationRelTimeCam(const char *name, const char *title) @@ -130,5 +134,10 @@ SetNumHiGainSaturationLimit(fgNumHiGainSaturationLimit); + SetReferencePixel(); + + SetRelTimeNbins(); + SetRelTimeFirst(); + SetRelTimeLast (); } @@ -200,7 +209,16 @@ for (Int_t i=0; iSetName ("HRelTimeHiGainPix"); + pix.GetHGausHist()->SetTitle("Rel. Times High Gain Pixel "); + + InitHists(pix,(*fBadPixels)[i],i); } } @@ -211,6 +229,15 @@ for (Int_t i=0; iSetName ("HRelTimeLoGainPix"); + pix.GetHGausHist()->SetTitle("Rel. Times Low Gain Pixel "); + InitHists((*this)(i),(*fBadPixels)[i],i); } @@ -225,23 +252,27 @@ { (*fAverageHiGainAreas)[j] = - new MHCalibrationRelTimePix("RelTimeAverageHiGainArea", - "Average Rel. Arr. Times Hi-Gain Area Idx "); - - MHCalibrationRelTimePix &hist = (MHCalibrationRelTimePix&)GetAverageHiGainArea(j); - - hist.SetNbins(fAverageNbins); - hist.GetHGausHist()->SetTitle("Rel. Arr. Times average HiGain Area Idx "); + new MHCalibrationPix("RelTimeAverageHiGainArea", + "Average Rel. Arr. Times High Gain Area Idx "); + + MHCalibrationPix &pix = GetAverageHiGainArea(j); + + pix.SetNbins(fRelTimeNbins*3); + pix.SetFirst(fRelTimeFirst); + pix.SetLast (fRelTimeLast); + + pix.GetHGausHist()->SetName ("HRelTimeHiGainPix"); + pix.GetHGausHist()->SetTitle("Rel. Times average High 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","Rel. Times 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); + pix.GetHGausHist()->SetTitle("Signal averaged on event-by-event basis High Gain Area Idx "); + InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadArea(j) : fCam->GetAverageBadArea(j),j); } } @@ -255,21 +286,27 @@ { (*fAverageLoGainAreas)[j] = - new MHCalibrationRelTimePix("RelTimeAverageAreaLoGain", - "Average Rel. Arr. Times Lo-Gain Area Idx "); - - MHCalibrationRelTimePix &hist = (MHCalibrationRelTimePix&)GetAverageLoGainArea(j); - hist.SetNbins(fAverageNbins); + new MHCalibrationPix("RelTimeAverageAreaLoGain", + "Average Rel. Arr. Times Low Gain Area Idx "); + + MHCalibrationPix &pix = GetAverageLoGainArea(j); + + pix.SetNbins(fRelTimeNbins*3); + pix.SetFirst(fRelTimeFirst); + pix.SetLast (fRelTimeLast); + + pix.GetHGausHist()->SetName ("HRelTimeLoGainPix"); + pix.GetHGausHist()->SetTitle("Rel. Times average Low Gain Area Idx "); if (fGeom->InheritsFrom("MGeomCamMagic")) { - hist.GetHGausHist()->SetTitle(Form("%s%s%s","Rel. Arr. Times averaged on event-by-event basis ", + pix.GetHGausHist()->SetTitle(Form("%s%s%s","Rel. Times 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("Rel. Arr. Times averaged on event-by-event basis Low Gain Area Idx "); - InitHists(hist,fIntensCam ? fIntensCam->GetAverageBadArea(j) : fCam->GetAverageBadArea(j),j); + pix.GetHGausHist()->SetTitle("Rel. Times averaged on event-by-event basis Low Gain Area Idx "); + InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadArea(j) : fCam->GetAverageBadArea(j),j); } } @@ -283,13 +320,17 @@ { (*fAverageHiGainSectors)[j] = - new MHCalibrationRelTimePix("RelTimeAverageSectorHiGain", - "Average HiGain Rel. Arr. Times Sector "); + new MHCalibrationPix("RelTimeAverageSectorHiGain", + "Average Rel. Arr. Times High Gain Sector "); - MHCalibrationRelTimePix &hist = (MHCalibrationRelTimePix&)GetAverageHiGainSector(j); - - hist.GetHGausHist()->SetTitle("Rel. Arr. Times averaged on event-by-event basis HiGain Sector "); - hist.SetNbins(fAverageNbins); + MHCalibrationPix &pix = GetAverageHiGainSector(j); + + pix.SetNbins(fRelTimeNbins*3); + pix.SetFirst(fRelTimeFirst); + pix.SetLast (fRelTimeLast); - InitHists(hist,fIntensCam ? fIntensCam->GetAverageBadSector(j) : fCam->GetAverageBadSector(j),j); + pix.GetHGausHist()->SetName ("HRelTimeHiGainPix"); + pix.GetHGausHist()->SetTitle("Rel. Times average High Gain Sector "); + + InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadSector(j) : fCam->GetAverageBadSector(j),j); } } @@ -302,13 +343,17 @@ { (*fAverageLoGainSectors)[j] = - new MHCalibrationRelTimePix("RelTimeAverageSectorLoGain", - "Average LoGain Rel. Arr. Times Sector "); + new MHCalibrationPix("RelTimeAverageSectorLoGain", + "Average Rel. Arr. Times Low Gain Sector "); - MHCalibrationRelTimePix &hist = (MHCalibrationRelTimePix&)GetAverageLoGainSector(j); - - hist.GetHGausHist()->SetTitle("Rel. Arr. Times averaged on event-by-event basis LoGain Sector "); - hist.SetNbins(fAverageNbins); + MHCalibrationPix &pix = GetAverageLoGainSector(j); + + pix.SetNbins(fRelTimeNbins*3); + pix.SetFirst(fRelTimeFirst); + pix.SetLast (fRelTimeLast); - InitHists(hist,fIntensCam ? fIntensCam->GetAverageBadSector(j) : fCam->GetAverageBadSector(j),j); + pix.GetHGausHist()->SetName ("HRelTimeLoGainPix"); + pix.GetHGausHist()->SetTitle("Rel. Times average Low Gain Sector "); + + InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadSector(j) : fCam->GetAverageBadSector(j),j); } } @@ -443,10 +488,10 @@ { - MHCalibrationRelTimePix &histhi = (MHCalibrationRelTimePix&)(*this)[i]; + MHCalibrationPix &histhi = (*this)[i]; if (histhi.IsExcluded()) continue; - MCalibrationRelTimePix &pix = fIntensCam + MCalibrationRelTimePix &pix = fIntensCam ? (MCalibrationRelTimePix&)(*fIntensCam)[i] : (MCalibrationRelTimePix&)(*fCam)[i]; @@ -483,9 +528,9 @@ { - MHCalibrationRelTimePix &histhi = (MHCalibrationRelTimePix&)GetAverageHiGainArea(j); + MHCalibrationPix &histhi = GetAverageHiGainArea(j); if (histhi.GetSaturated() > fNumHiGainSaturationLimit*histhi.GetHGausHist()->GetEntries()) { - MCalibrationRelTimePix &pix = fIntensCam + MCalibrationRelTimePix &pix = fIntensCam ? (MCalibrationRelTimePix&)fIntensCam->GetAverageArea(j) : (MCalibrationRelTimePix&)fCam->GetAverageArea(j); @@ -502,6 +547,6 @@ { - MHCalibrationRelTimePix &histhi = (MHCalibrationRelTimePix&)GetAverageHiGainSector(j); - MCalibrationRelTimePix &pix = fIntensCam + MHCalibrationPix &histhi = GetAverageHiGainSector(j); + MCalibrationRelTimePix &pix = fIntensCam ? (MCalibrationRelTimePix&)fIntensCam->GetAverageSector(j) : (MCalibrationRelTimePix&)fCam->GetAverageSector(j); @@ -561,8 +606,8 @@ // ============== // -// 0: Fitted Mean Relative Arrival Time in FADC slices (MHGausEvents::GetMean()*MHCalibrationRelTimePix::GetFADCSliceWidth()) -// 1: Error Mean Relative Arrival Time in FADC slices (MHGausEvents::GetMeanErr()*MHCalibrationRelTimePix::GetFADCSliceWidth()) -// 2: Sigma fitted Relative Arrival Time in FADC slices (MHGausEvents::GetSigma()*MHCalibrationRelTimePix::GetFADCSliceWidth()) -// 3: Error Sigma Relative Arrival Time in FADC slices (MHGausEvents::GetSigmaErr()*MHCalibrationRelTimePix::GetFADCSliceWidth()) +// 0: Fitted Mean Relative Arrival Time in FADC slices (MHGausEvents::GetMean() +// 1: Error Mean Relative Arrival Time in FADC slices (MHGausEvents::GetMeanErr() +// 2: Sigma fitted Relative Arrival Time in FADC slices (MHGausEvents::GetSigma() +// 3: Error Sigma Relative Arrival Time in FADC slices (MHGausEvents::GetSigmaErr() // // Useful variables derived from the fit results: @@ -583,5 +628,5 @@ return kFALSE; - const MHCalibrationRelTimePix &pix = (MHCalibrationRelTimePix&)(*this)[idx]; + const MHCalibrationPix &pix = (*this)[idx]; switch (type) Index: /trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.h =================================================================== --- /trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.h (revision 4937) +++ /trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.h (revision 4938) @@ -21,21 +21,27 @@ static const Float_t fgNumHiGainSaturationLimit; //! The default for fNumHiGainSaturationLimit (now at: 0.25) - static const UInt_t fgReferencePixel; //! Default for fReferencePixel (now set to: 1) + static const UInt_t fgReferencePixel; //! Default for fReferencePixel (now set to: 1) + static const Int_t fgRelTimeNbins; //! Default number of bins (now set to: 900 ) + static const Axis_t fgRelTimeFirst; //! Default lower histogram limit (now set to: -13.5 ) + static const Axis_t fgRelTimeLast; //! Default upper histogram limit (now set to: 13.5 ) - MArrayD fSumareahi ; //! - MArrayD fSumarealo ; //! - MArrayD fSumsectorhi; //! - MArrayD fSumsectorlo; //! - MArrayI fNumareahi ; //! - MArrayI fNumarealo ; //! - MArrayI fNumsectorhi; //! - MArrayI fNumsectorlo; //! + MArrayD fSumareahi ; //! + MArrayD fSumarealo ; //! + MArrayD fSumsectorhi; //! + MArrayD fSumsectorlo; //! + MArrayI fNumareahi ; //! + MArrayI fNumarealo ; //! + MArrayI fNumsectorhi; //! + MArrayI fNumsectorlo; //! - UInt_t fReferencePixel; // The reference pixel for rel. times + UInt_t fReferencePixel; // The reference pixel for rel. times + Int_t fRelTimeNbins; // Number of bins (now set to: 900 ) + Axis_t fRelTimeFirst; // Lower histogram limit (now set to: -13.5 ) + Axis_t fRelTimeLast; // Upper histogram limit (now set to: 13.5 ) Bool_t ReInitHists(MParList *pList); Bool_t FillHists(const MParContainer *par, const Stat_t w=1); Bool_t FinalizeHists(); - void FinalizeBadPixels(); + void FinalizeBadPixels(); public: @@ -44,8 +50,12 @@ ~MHCalibrationRelTimeCam() {} - UInt_t GetReferencePixel() const { return fReferencePixel; } - void SetReferencePixel(const UInt_t i=fgReferencePixel) { fReferencePixel = i; } - - + UInt_t GetReferencePixel() const { return fReferencePixel; } + + // Setters + void SetReferencePixel( const UInt_t i=fgReferencePixel) { fReferencePixel = i; } + void SetRelTimeNbins ( const Int_t i=fgRelTimeNbins ) { fRelTimeNbins = i; } + void SetRelTimeFirst ( const Axis_t f=fgRelTimeFirst ) { fRelTimeFirst = f; } + void SetRelTimeLast ( const Axis_t f=fgRelTimeLast ) { fRelTimeLast = f; } + Bool_t GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type=0) const; void DrawPixelContent(Int_t idx) const; Index: unk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimePix.cc =================================================================== --- /trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimePix.cc (revision 4937) +++ (revision ) @@ -1,80 +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 -! -! -\* ======================================================================== */ - -////////////////////////////////////////////////////////////////////////////// -// -// MHCalibrationRelTimePix -// -// Histogram class for the relative arrival time calibration. -// Stores and fits the relative arrival times between pixel fPixId and -// pixel number 1 (hardware index: 2). Times are taken from MArrivalTimePix -// -////////////////////////////////////////////////////////////////////////////// -#include "MHCalibrationRelTimePix.h" - -#include - -ClassImp(MHCalibrationRelTimePix); - -using namespace std; -// -const Int_t MHCalibrationRelTimePix::fgRelTimeNbins = 900; -const Axis_t MHCalibrationRelTimePix::fgRelTimeFirst = -5.; -const Axis_t MHCalibrationRelTimePix::fgRelTimeLast = 5.; -const Float_t MHCalibrationRelTimePix::fgFADCSliceWidth = 3.3333; -// -------------------------------------------------------------------------- -// -// Default Constructor. -// -// Sets: -// - the default number for fNbins (fgRelTimeNbins) -// - the default number for fFirst (fgRelTimeFirst) -// - the default number for fLast (fgRelTimeLast) -// -// - the default name of the fHGausHist ("HCalibrationRelTime") -// - the default title of the fHGausHist ("Distribution of Relative Arrival Times Pixel ") -// - the default x-axis title for fHGausHist ("FADC Slice") -// - the default y-axis title for fHGausHist ("Nr. of events") -// -// - the default number for fFADCSliceWidth (fgFADCSliceWidth) -// -MHCalibrationRelTimePix::MHCalibrationRelTimePix(const char *name, const char *title) -{ - - fName = name ? name : "MHCalibrationRelTimePix"; - fTitle = title ? title : "Histogrammed Calibration Relative Arrival Time events"; - - SetNbins ( fgRelTimeNbins ); - SetFirst ( fgRelTimeFirst ); - SetLast ( fgRelTimeLast ); - SetFADCSliceWidth(); - - // Create a large number of bins, later we will rebin - fHGausHist.SetName("HCalibrationRelTime"); - fHGausHist.SetTitle("Distribution of Relative Arrival Times Pixel "); - fHGausHist.SetXTitle("FADC Slice"); - fHGausHist.SetYTitle("Nr. of events"); - -} - Index: unk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimePix.h =================================================================== --- /trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimePix.h (revision 4937) +++ (revision ) @@ -1,34 +1,0 @@ -#ifndef MARS_MHCalibrationRelTimePix -#define MARS_MHCalibrationRelTimePix - -#ifndef MARS_MHCalibrationPix -#include "MHCalibrationPix.h" -#endif - -class MHCalibrationRelTimePix : public MHCalibrationPix -{ - -private: - - static const Int_t fgRelTimeNbins; //! Default for fNbins (now set to: 900 ) - static const Axis_t fgRelTimeFirst; //! Default for fFirst (now set to: -13.5 ) - static const Axis_t fgRelTimeLast; //! Default for fLast (now set to: 13.5 ) - static const Float_t fgFADCSliceWidth; //! Default for fFADCSliceWidth (now set to: 3.333) - - Float_t fFADCSliceWidth; // Time FADC Slice Width in ns. - -public: - - MHCalibrationRelTimePix(const char *name=NULL, const char *title=NULL); - ~MHCalibrationRelTimePix() {} - - // Getters - Float_t GetFADCSliceWidth() const { return fFADCSliceWidth; } - - // Setters - void SetFADCSliceWidth( const Float_t f=fgFADCSliceWidth ) { fFADCSliceWidth = f; } - - ClassDef(MHCalibrationRelTimePix, 1) // Histogram class for Relative Time Pixel Calibration -}; - -#endif Index: /trunk/MagicSoft/Mars/mhcalib/Makefile =================================================================== --- /trunk/MagicSoft/Mars/mhcalib/Makefile (revision 4937) +++ /trunk/MagicSoft/Mars/mhcalib/Makefile (revision 4938) @@ -40,5 +40,4 @@ MHCalibrationChargePINDiode.cc \ MHCalibrationRelTimeCam.cc \ - MHCalibrationRelTimePix.cc \ MHCalibrationTestCam.cc \ MHCalibrationTestPix.cc \