Index: /trunk/MagicSoft/Mars/Changelog =================================================================== --- /trunk/MagicSoft/Mars/Changelog (revision 3898) +++ /trunk/MagicSoft/Mars/Changelog (revision 3899) @@ -50,4 +50,6 @@ 2004/04/29: Markus Gaug + * msignal/MArrivalTimePix.[h,cc] + - removed flag fLoGainUsed which is not used at all * msignal/MTimeExtractor.[h,cc] Index: /trunk/MagicSoft/Mars/mcalib/MHCalibrationRelTimeCam.cc =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MHCalibrationRelTimeCam.cc (revision 3898) +++ /trunk/MagicSoft/Mars/mcalib/MHCalibrationRelTimeCam.cc (revision 3899) @@ -209,5 +209,5 @@ "Average Relative Arrival Times High Gain Area Idx "); - GetAverageHiGainArea(j).GetHGausHist()->SetTitle("Relative Arrival Times HiGain Area Idx "); + GetAverageHiGainArea(j).GetHGausHist()->SetTitle("Rel. Arr. Times HiGain Area Idx "); GetAverageHiGainArea(j).SetNbins(fAverageNbins); @@ -226,5 +226,5 @@ "Average Relative Arrival Times Low Gain Area Idx "); - GetAverageLoGainArea(j).GetHGausHist()->SetTitle("Relative Arrival Times LoGain Area Idx "); + GetAverageLoGainArea(j).GetHGausHist()->SetTitle("Rel. Arr. Times LoGain Area Idx "); GetAverageLoGainArea(j).SetNbins(fAverageNbins); @@ -243,5 +243,5 @@ "Average Relative Arrival Times High Gain Sector "); - GetAverageHiGainSector(j).GetHGausHist()->SetTitle("Relative Arrival Times HiGain Sector "); + GetAverageHiGainSector(j).GetHGausHist()->SetTitle("Rel. Arr. Times HiGain Sector "); GetAverageHiGainSector(j).SetNbins(fAverageNbins); @@ -260,5 +260,5 @@ "Average Relative Arrival Times Low Gain Sector "); - GetAverageLoGainSector(j).GetHGausHist()->SetTitle("Relative Arrival Times LoGain Sector "); + GetAverageLoGainSector(j).GetHGausHist()->SetTitle("Rel. Arr. Times LoGain Sector "); GetAverageLoGainSector(j).SetNbins(fAverageNbins); @@ -333,4 +333,5 @@ if (pix.IsLoGainUsed()) { + histlo.FillHistAndArray(reltime); sumarealo [aidx] += reltime; @@ -341,4 +342,5 @@ else { + histhi.FillHistAndArray(reltime) ; sumareahi [aidx] += reltime; Index: /trunk/MagicSoft/Mars/msignal/MArrivalTimePix.cc =================================================================== --- /trunk/MagicSoft/Mars/msignal/MArrivalTimePix.cc (revision 3898) +++ /trunk/MagicSoft/Mars/msignal/MArrivalTimePix.cc (revision 3899) @@ -57,5 +57,4 @@ fArrivalTimeLoGain(gkSignalInitializer), fArrivalTimeLoGainError(gkSignalInitializer), - fIsLoGainUsed(kFALSE), fNumHiGainSaturated(0), fNumLoGainSaturated(0) @@ -76,6 +75,4 @@ fArrivalTimeLoGainError = gkSignalInitializer; - fIsLoGainUsed = kFALSE; - fNumHiGainSaturated = 0; fNumLoGainSaturated = 0; @@ -89,5 +86,5 @@ void MArrivalTimePix::SetArrivalTime(Float_t sighi, Float_t sighierr, - Float_t siglo, Float_t sigloerr) + Float_t siglo, Float_t sigloerr) { fArrivalTimeHiGain = sighi; @@ -105,5 +102,4 @@ { - fIsLoGainUsed = sat; fNumHiGainSaturated = higain; fNumLoGainSaturated = logain; @@ -114,5 +110,4 @@ *fLog << " Signal: " << fArrivalTimeHiGain << " +- " << fArrivalTimeHiGainError - << " LoGain? " << fIsLoGainUsed << " Nr. Sat. Hi Gain: " << fNumHiGainSaturated << " Nr. Sat. Lo Gain: " << fNumLoGainSaturated Index: /trunk/MagicSoft/Mars/msignal/MArrivalTimePix.h =================================================================== --- /trunk/MagicSoft/Mars/msignal/MArrivalTimePix.h (revision 3898) +++ /trunk/MagicSoft/Mars/msignal/MArrivalTimePix.h (revision 3899) @@ -14,5 +14,4 @@ Float_t fArrivalTimeLoGainError; // error of the mean value of the ArrivalTime - Bool_t fIsLoGainUsed; Byte_t fNumHiGainSaturated; Byte_t fNumLoGainSaturated; @@ -38,5 +37,5 @@ Byte_t GetNumLoGainSaturated() const { return fNumLoGainSaturated; } - Bool_t IsLoGainUsed() const { return fIsLoGainUsed; } + Bool_t IsLoGainUsed() const { return fNumHiGainSaturated > 0; } Bool_t IsValid() const; Index: /trunk/MagicSoft/Mars/msignal/MExtractTimeSpline.cc =================================================================== --- /trunk/MagicSoft/Mars/msignal/MExtractTimeSpline.cc (revision 3899) +++ /trunk/MagicSoft/Mars/msignal/MExtractTimeSpline.cc (revision 3899) @@ -0,0 +1,203 @@ +/* ======================================================================== *\ +! +! * +! * 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 analyzing 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): Sebastian Raducci 12/2003 +! Markus Gaug 04/2004 +! +! Copyright: MAGIC Software Development, 2002-2004 +! +! +\* ======================================================================== */ + +////////////////////////////////////////////////////////////////////////////// +// +// MExtractTimeSpline +// +// This is a task that calculates the arrival times of photons. +// It returns the absolute maximum of the spline that interpolates +// the FADC slices +// +// +////////////////////////////////////////////////////////////////////////////// +#include "MExtractTimeSpline.h" +#include "MCubicSpline.h" + +#include "MGeomCam.h" +#include "MPedestalPix.h" + +#include "MLog.h" +#include "MLogManip.h" + + +ClassImp(MExtractTimeSpline); + +using namespace std; + +const Byte_t MExtractTimeSpline::fgHiGainFirst = 0; +const Byte_t MExtractTimeSpline::fgHiGainLast = 14; +const Byte_t MExtractTimeSpline::fgLoGainFirst = 3; +const Byte_t MExtractTimeSpline::fgLoGainLast = 14; +// -------------------------------------------------------------------------- +// +// Default constructor. +// +// Calls: +// - SetRange(fgHiGainFirst, fgHiGainLast, fgLoGainFirst, fgLoGainLast) +// +MExtractTimeSpline::MExtractTimeSpline(const char *name, const char *title) + : fXHiGain(NULL), fXLoGain(NULL) +{ + + fName = name ? name : "MExtractTimeSpline"; + fTitle = title ? title : "Calculate photons arrival time using a spline"; + + SetRange(fgHiGainFirst, fgHiGainLast, fgLoGainFirst, fgLoGainLast); + +} + +MExtractTimeSpline::~MExtractTimeSpline() +{ + + if (fXHiGain) + delete fXHiGain; + if (fXLoGain) + delete fXLoGain; + +} + + +// -------------------------------------------------------------------------- +// +// SetRange: +// +// Calls: +// - MExtractor::SetRange(hifirst,hilast,lofirst,lolast); +// - Deletes x, if not NULL +// - Creates x according to the range +// +void MExtractTimeSpline::SetRange(Byte_t hifirst, Byte_t hilast, Byte_t lofirst, Byte_t lolast) +{ + + MExtractor::SetRange(hifirst,hilast,lofirst,lolast); + + if (fXHiGain) + delete fXHiGain; + + if (fXLoGain) + delete fXLoGain; + + Int_t range = fHiGainLast - fHiGainFirst + 1; + + if (range < 2) + { + *fLog << warn << GetDescriptor() + << Form("%s%2i%s%2i%s",": Hi-Gain Extraction range [",(int)fHiGainFirst,"," + ,fHiGainLast,"] too small, ") << endl; + *fLog << warn << GetDescriptor() + << " will move higher limit to obtain 4 slices " << endl; + SetRange(fHiGainFirst, fHiGainLast+4-range,fLoGainFirst,fLoGainLast); + range = fHiGainLast - fHiGainFirst + 1; + } + + fXHiGain = new Byte_t[range+1]; + for (Int_t i=0; i= 2) + { + + fXLoGain = new Byte_t[range+1]; + for (Int_t i=0; i= fSaturationLimit) + sat++; + + // + // Initialize the spline + // + MCubicSpline spline(first,fXHiGain,kTRUE,range,0.0,0.0); + + // + // Now find the maximum + // + Double_t abMaximum = spline.EvalAbMax(); + Double_t maximum = spline.EvalMax(); + const Double_t pedestal = ped.GetPedestal(); + const Double_t halfMax = (maximum + pedestal)/2.; + time = (halfMax > pedestal) ? (Float_t ) spline.FindVal(halfMax,abMaximum,'l') + (Float_t)fHiGainFirst : 0.0; +} + +// -------------------------------------------------------------------------- +// +// Calculates the arrival time for each pixel +// +void MExtractTimeSpline::FindTimeLoGain(Byte_t *first, Float_t &time, Float_t &dtime, + Byte_t &sat, const MPedestalPix &ped) const +{ + + const Int_t range = fLoGainLast - fLoGainFirst + 1; + + if (range < 2) + return; + + const Byte_t *end = first + range; + Byte_t *p = first; + + // + // Check for saturation in all other slices + // + while (p= fSaturationLimit) + sat++; + + // + // Initialize the spline + // + MCubicSpline spline(first,fXLoGain,kTRUE,range,0.0,0.0); + + // + // Now find the maximum + // + Double_t abMaximum = spline.EvalAbMax(); + Double_t maximum = spline.EvalMax(); + const Double_t pedestal = ped.GetPedestal(); + const Double_t halfMax = (maximum + pedestal)/2.; + + time = (halfMax > pedestal) ? (Float_t )spline.FindVal(halfMax,abMaximum,'l') + (Float_t)fLoGainFirst : 0.0; +} + Index: /trunk/MagicSoft/Mars/msignal/Makefile =================================================================== --- /trunk/MagicSoft/Mars/msignal/Makefile (revision 3898) +++ /trunk/MagicSoft/Mars/msignal/Makefile (revision 3899) @@ -48,4 +48,6 @@ MExtractBlindPixel.cc \ MExtractedSignalBlindPixel.cc \ + MTimeExtractor.cc \ + MExtractTimeSpline.cc \ MArrivalTime.cc \ MArrivalTimeCalc.cc \ Index: /trunk/MagicSoft/Mars/msignal/SignalLinkDef.h =================================================================== --- /trunk/MagicSoft/Mars/msignal/SignalLinkDef.h (revision 3898) +++ /trunk/MagicSoft/Mars/msignal/SignalLinkDef.h (revision 3899) @@ -22,4 +22,6 @@ #pragma link C++ class MExtractedSignalBlindPixel++; +#pragma link C++ class MTimeExtractor+; +#pragma link C++ class MExtractTimeSpline+; #pragma link C++ class MArrivalTimeCam; #pragma link C++ class MArrivalTimePix;