From 1dfadc321ff9086e602fea77cc4dcc3495bf3c3a Mon Sep 17 00:00:00 2001 From: kharlov Date: Fri, 10 Jul 2009 20:16:10 +0000 Subject: [PATCH] Cosmetic changes and correction of comments with use case. --- PHOS/AliPHOSQADataMakerRec.cxx | 3 --- PHOS/AliPHOSRawFitterv0.cxx | 19 ++----------------- PHOS/AliPHOSRawFitterv0.h | 4 ---- PHOS/AliPHOSRawFitterv1.cxx | 4 +--- PHOS/AliPHOSRawFitterv2.cxx | 4 +--- 5 files changed, 4 insertions(+), 30 deletions(-) diff --git a/PHOS/AliPHOSQADataMakerRec.cxx b/PHOS/AliPHOSQADataMakerRec.cxx index bc6dfd92503..b2a29a30825 100644 --- a/PHOS/AliPHOSQADataMakerRec.cxx +++ b/PHOS/AliPHOSQADataMakerRec.cxx @@ -415,13 +415,10 @@ void AliPHOSQADataMakerRec::MakeRaws(AliRawReader* rawReader) const UShort_t *sig = fRawStream->GetSignals(); Int_t sigStart = fRawStream->GetStartTimeBin(); Int_t sigLength = fRawStream->GetBunchLength(); - fitter->SetSamples(sig,sigStart,sigLength); fitter->SetChannelGeo(module,cellX,cellZ,caloFlag); fitter->Eval(sig,sigStart,sigLength); } // End of NextBunch() - fitter->SetNBunches(nBunches); - Double_t energy = fitter->GetEnergy() ; Double_t time = fitter->GetTime() ; diff --git a/PHOS/AliPHOSRawFitterv0.cxx b/PHOS/AliPHOSRawFitterv0.cxx index 0afdd36d8c0..8af327035b0 100644 --- a/PHOS/AliPHOSRawFitterv0.cxx +++ b/PHOS/AliPHOSRawFitterv0.cxx @@ -22,11 +22,9 @@ // of bunches in the signal. // // AliPHOSRawFitterv0 *fitterv0=new AliPHOSRawFitterv0(); -// fitterv0->SetSamples(sig,sigStart,sigLength); -// fitterv0->SetNBunches(nBunches); // fitterv0->SetChannelGeo(module,cellX,cellZ,caloFlag); // fitterv0->SetCalibData(fgCalibData) ; -// fitterv0->Eval(); +// fitterv0->Eval(sig,sigStart,sigLength); // Double_t amplitude = fitterv0.GetEnergy(); // Double_t time = fitterv0.GetTime(); // Bool_t isLowGain = fitterv0.GetCaloFlag()==0; @@ -120,20 +118,6 @@ AliPHOSRawFitterv0& AliPHOSRawFitterv0::operator = (const AliPHOSRawFitterv0 &ph //----------------------------------------------------------------------------- -void AliPHOSRawFitterv0::SetSamples(const UShort_t *sig, Int_t sigStart, Int_t sigLength) -{ - // Set the sample array, its start and length in time bin units - -// fStart = sigStart; -// fLength = sigLength; -// fSignal = sig; -// fSignal = new UShort_t[fLength]; -// for (Int_t i=0; ikBaseLine ) fTime = (Double_t)i; } + fTime += sigStart; fEnergy = (Double_t)maxSample; if (maxSample > 900 && nMax > 2) fOverflow = kTRUE; diff --git a/PHOS/AliPHOSRawFitterv0.h b/PHOS/AliPHOSRawFitterv0.h index 2f9317f8262..61e34b13adc 100644 --- a/PHOS/AliPHOSRawFitterv0.h +++ b/PHOS/AliPHOSRawFitterv0.h @@ -25,7 +25,6 @@ public: void SubtractPedestals(Bool_t subtract) {fPedSubtract = subtract;} void SetAmpOffset (Int_t extPed=5) {fAmpOffset = extPed ;} void SetAmpThreshold (Int_t thr=5) {fAmpThreshold = thr ;} - void SetSamples(const UShort_t *sig, Int_t sigStart, Int_t sigLength); void SetNBunches(const Int_t nBunches) { fNBunches = nBunches; } void SetChannelGeo(const Int_t module, const Int_t cellX, const Int_t cellZ, const Int_t caloFlag); @@ -45,13 +44,10 @@ public: protected: -// UShort_t *fSignal; // array of samples Int_t fModule; // PHOS module number Int_t fCellX; // cell number along X-axis Int_t fCellZ; // cell number along Z-axis Int_t fCaloFlag; // 0=LG, 1=HG, 2=TRU -// Int_t fStart; // time bin of start signal -// Int_t fLength; // signal length in time bins Int_t fNBunches; // number of bunches in a signal Bool_t fPedSubtract; // pedestals subtraction (kTRUE="yes") Double_t fEnergy; // "digit" energy diff --git a/PHOS/AliPHOSRawFitterv1.cxx b/PHOS/AliPHOSRawFitterv1.cxx index d9b9679152a..09f3a311d5e 100644 --- a/PHOS/AliPHOSRawFitterv1.cxx +++ b/PHOS/AliPHOSRawFitterv1.cxx @@ -21,11 +21,9 @@ // // Typical use case: // AliPHOSRawFitter *fitter=new AliPHOSRawFitter(); -// fitter->SetSamples(sig,sigStart,sigLength); -// fitter->SetNBunches(nBunches); // fitter->SetChannelGeo(module,cellX,cellZ,caloFlag); // fitter->SetCalibData(fgCalibData) ; -// fitter->Eval(); +// fitter->Eval(sig,sigStart,sigLength); // Double_t amplitude = fitter.GetEnergy(); // Double_t time = fitter.GetTime(); // Bool_t isLowGain = fitter.GetCaloFlag()==0; diff --git a/PHOS/AliPHOSRawFitterv2.cxx b/PHOS/AliPHOSRawFitterv2.cxx index 098bd8cf3b8..1a1a6a4f545 100644 --- a/PHOS/AliPHOSRawFitterv2.cxx +++ b/PHOS/AliPHOSRawFitterv2.cxx @@ -19,11 +19,9 @@ // // Typical use case: // AliPHOSRawFitter *fitter=new AliPHOSRawFitter(); -// fitter->SetSamples(sig,sigStart,sigLength); -// fitter->SetNBunches(nBunches); // fitter->SetChannelGeo(module,cellX,cellZ,caloFlag); // fitter->SetCalibData(fgCalibData) ; -// fitter->Eval(); +// fitter->Eval(sig,sigStart,sigLength); // Double_t amplitude = fitter.GetEnergy(); // Double_t time = fitter.GetTime(); // Bool_t isLowGain = fitter.GetCaloFlag()==0; -- 2.43.0