Index: trunk/MagicSoft/Mars/mhcalib/HCalibLinkDef.h =================================================================== --- trunk/MagicSoft/Mars/mhcalib/HCalibLinkDef.h (revision 4939) +++ trunk/MagicSoft/Mars/mhcalib/HCalibLinkDef.h (revision 4940) @@ -15,5 +15,4 @@ #pragma link C++ class MHCalibrationTestCam+; #pragma link C++ class MHCalibrationTestTimeCam+; -#pragma link C++ class MHCalibrationTestTimePix+; #pragma link C++ class MHGausEvents++; Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestTimeCam.cc =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestTimeCam.cc (revision 4939) +++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestTimeCam.cc (revision 4940) @@ -106,7 +106,16 @@ using namespace std; + +const Int_t MHCalibrationTestTimeCam::fgTestNbins = 600; +const Axis_t MHCalibrationTestTimeCam::fgTestFirst = -0.5; +const Axis_t MHCalibrationTestTimeCam::fgTestLast = 29.5; // -------------------------------------------------------------------------- // // Default Constructor. +// +// Sets: +// - fTestNbins to fgTestNbins +// - fTestFirst to fgTestFirst +// - fTestLast to fgTestLast // MHCalibrationTestTimeCam::MHCalibrationTestTimeCam(const char *name, const char *title) @@ -116,5 +125,8 @@ fTitle = title ? title : "Histogram class for testing the calibration of arrival times"; - SetAverageNbins(5000); + SetTestNbins(); + SetTestFirst(); + SetTestLast (); + } @@ -164,6 +176,19 @@ for (Int_t i=0; iSetName ("HTestHiGainPix"); + h->SetTitle("Calibrated Rel. Arrival Times Pixel "); + h->SetXTitle("Arrival Time [FADC slices]"); + h->SetYTitle("Nr. of events"); + InitHists((*this)[i],(*fBadPixels)[i],i); } @@ -177,17 +202,25 @@ { (*fAverageHiGainAreas)[j] = - new MHCalibrationTestTimePix("MHCalibrationTestTimeAverageArea", + new MHCalibrationPix("TestTimeArea", "Average TestTime Calibrations Area Idx "); - GetAverageHiGainArea(j).GetHGausHist()->SetTitle("TestTime Calibrations Area Idx "); - GetAverageHiGainArea(j).SetNbins(fAverageNbins); - GetAverageHiGainArea(j).InitBins(); - GetAverageHiGainArea(j).ChangeHistId(j); - GetAverageHiGainArea(j).SetEventFrequency(fPulserFrequency); - - TH1F *h = GetAverageHiGainArea(j).GetHGausHist(); + MHCalibrationPix &pix = GetAverageHiGainArea(j); + + pix.SetNbins(fTestNbins*3); + pix.SetFirst(fTestFirst); + pix.SetLast (fTestLast); + + TH1F *h = pix.GetHGausHist(); + + h->SetName ("HTestTimeArea"); + h->SetTitle("Calibrated Rel. Arrival Times Area Idx "); + h->SetXTitle("Arrival Time [FADC slices]"); + h->SetYTitle("Nr. of events"); + + pix.InitBins(); + pix.ChangeHistId(j); + pix.SetEventFrequency(fPulserFrequency); + h->SetTitle( Form("%s%s", h->GetTitle()," Runs: ")); - - } } @@ -201,16 +234,25 @@ { (*fAverageHiGainSectors)[j] = - new MHCalibrationTestTimePix("MHCalibrationTestTimeAverageSector", + new MHCalibrationPix("TestTimeSector", "Average TestTime Calibrations Sector "); - GetAverageHiGainSector(j).GetHGausHist()->SetTitle("TestTime Calibrations Sector "); - GetAverageHiGainSector(j).SetNbins(fAverageNbins); - GetAverageHiGainSector(j).InitBins(); - GetAverageHiGainSector(j).ChangeHistId(j); - GetAverageHiGainSector(j).SetEventFrequency(fPulserFrequency); - TH1F *h = GetAverageHiGainSector(j).GetHGausHist(); - h->SetTitle( Form("%s%s", h->GetTitle()," Runs: ")); - - + MHCalibrationPix &pix = GetAverageHiGainSector(j); + + pix.SetNbins(fTestNbins*3); + pix.SetFirst(fTestFirst); + pix.SetLast (fTestLast); + + TH1F *h = pix.GetHGausHist(); + + h->SetName ("HTestTimeSector"); + h->SetTitle("Calibrated Rel. Arr. Times Sector "); + h->SetXTitle("Arrival Time [FADC slices]"); + h->SetYTitle("Nr. of events"); + + pix.InitBins(); + pix.ChangeHistId(j); + pix.SetEventFrequency(fPulserFrequency); + + h->SetTitle( Form("%s%s", h->GetTitle()," Runs: ")); } } Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestTimeCam.h =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestTimeCam.h (revision 4939) +++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestTimeCam.h (revision 4940) @@ -11,4 +11,12 @@ private: + static const Int_t fgTestNbins; // Default for fTestNBins (now set to: 600 ) + static const Axis_t fgTestFirst; // Default for fTestFirst (now set to: -0.5 ) + static const Axis_t fgTestLast; // Default for fTestLast (now set to: 29.5) + + Int_t fTestNbins; // Number of bins + Axis_t fTestFirst; // Lower histogram limit + Axis_t fTestLast; // Upper histogram limit + Bool_t ReInitHists(MParList *pList); Bool_t FillHists(const MParContainer *par, const Stat_t w=1); @@ -26,4 +34,8 @@ void CalcAverageSigma(); + void SetTestNbins ( const Int_t i=fgTestNbins ) { fTestNbins = i; } + void SetTestFirst ( const Axis_t f=fgTestFirst ) { fTestFirst = f; } + void SetTestLast ( const Axis_t f=fgTestLast ) { fTestLast = f; } + ClassDef(MHCalibrationTestTimeCam, 0) // Histogram class for Relative Time Camera Calibration }; Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestTimePix.cc =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestTimePix.cc (revision 4939) +++ (revision ) @@ -1,78 +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 05/2004 -! -! Copyright: MAGIC Software Development, 2000-2004 -! -! -\* ======================================================================== */ -////////////////////////////////////////////////////////////////////////////// -// -// MHCalibrationTestTimePix -// -// Histogram class for the charge calibration. -// Stores and fits the charges and stores the location of the maximum FADC -// slice. TestTimes are taken from MExtractedSignalPix. -// -////////////////////////////////////////////////////////////////////////////// -#include "MHCalibrationTestTimePix.h" - -#include "MLog.h" -#include "MLogManip.h" - -ClassImp(MHCalibrationTestTimePix); - -using namespace std; - -const Int_t MHCalibrationTestTimePix::fgChargeNbins = 600; -const Axis_t MHCalibrationTestTimePix::fgChargeFirst = -0.5; -const Axis_t MHCalibrationTestTimePix::fgChargeLast = 29.5; -// -------------------------------------------------------------------------- -// -// Default Constructor. -// -// Sets: -// - the default number for fNbins (fgChargeNbins) -// - the default number for fFirst (fgChargeFirst) -// - the default number for fLast (fgChargeLast) -// -// - the default name of the fHGausHist ("HCalibrationTestTime") -// - the default title of the fHGausHist ("Distribution of calibrated FADC slices Pixel ") -// - the default x-axis title for fHGausHist ("Sum FADC Slices") -// - the default y-axis title for fHGausHist ("Nr. of events") -// -// Calls: -// - Clear(); -// -MHCalibrationTestTimePix::MHCalibrationTestTimePix(const char *name, const char *title) -{ - - fName = name ? name : "MHCalibrationTestTimePix"; - fTitle = title ? title : "Statistics of the calibrated FADC sums of calibration events"; - - SetNbins ( fgChargeNbins ); - SetFirst ( fgChargeFirst ); - SetLast ( fgChargeLast ); - - fHGausHist.SetName("HCalibrationTestTime"); - fHGausHist.SetTitle("Distribution of calibrated Arrival Times Pixel"); - fHGausHist.SetXTitle("Arrival Time [FADC units]"); - fHGausHist.SetYTitle("Nr. of events"); - -} - Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestTimePix.h =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestTimePix.h (revision 4939) +++ (revision ) @@ -1,26 +1,0 @@ -#ifndef MARS_MHCalibrationTestTimePix -#define MARS_MHCalibrationTestTimePix - -#ifndef MARS_MHCalibrationPix -#include "MHCalibrationPix.h" -#endif - -class TH1F; -class MHCalibrationTestTimePix : public MHCalibrationPix -{ - -private: - - static const Int_t fgChargeNbins; // Default for fNBins (now set to: 2000 ) - static const Axis_t fgChargeFirst; // Default for fFirst (now set to: -0.5 ) - static const Axis_t fgChargeLast; // Default for fLast (now set to: 1999.5) - -public: - - MHCalibrationTestTimePix(const char *name=NULL, const char *title=NULL); - ~MHCalibrationTestTimePix() {} - - ClassDef(MHCalibrationTestTimePix, 1) // Base Histogram class for TestTime Pixel Calibration -}; - -#endif Index: trunk/MagicSoft/Mars/mhcalib/Makefile =================================================================== --- trunk/MagicSoft/Mars/mhcalib/Makefile (revision 4939) +++ trunk/MagicSoft/Mars/mhcalib/Makefile (revision 4940) @@ -42,5 +42,4 @@ MHCalibrationTestCam.cc \ MHCalibrationTestTimeCam.cc \ - MHCalibrationTestTimePix.cc \ MHGausEvents.cc