From a4f1da468d1e87c27c55d09c3816e336f5517ae3 Mon Sep 17 00:00:00 2001 From: coppedis Date: Fri, 19 Oct 2007 08:07:04 +0000 Subject: [PATCH 1/1] Updated object (increased number of pedestal out-of-time used for calibration) --- ZDC/AliZDCCalibData.cxx | 28 ++++++++++++---------------- ZDC/AliZDCCalibData.h | 10 +++++----- 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/ZDC/AliZDCCalibData.cxx b/ZDC/AliZDCCalibData.cxx index 1331ed7074a..819ae5fb013 100644 --- a/ZDC/AliZDCCalibData.cxx +++ b/ZDC/AliZDCCalibData.cxx @@ -53,8 +53,6 @@ AliZDCCalibData::AliZDCCalibData(const AliZDCCalibData& calibda) : for(int t=0; t<47; t++){ fMeanPedestal[t] = calibda.GetMeanPed(t); fMeanPedWidth[t] = calibda.GetMeanPedWidth(t); - } - for(int t=0; t<44; t++){ fOOTPedestal[t] = calibda.GetOOTPed(t); fOOTPedWidth[t] = calibda.GetOOTPedWidth(t); fPedCorrCoeff[0][t] = calibda.GetPedCorrCoeff0(t); @@ -78,8 +76,6 @@ AliZDCCalibData &AliZDCCalibData::operator =(const AliZDCCalibData& calibda) for(int t=0; t<47; t++){ fMeanPedestal[t] = calibda.GetMeanPed(t); fMeanPedWidth[t] = calibda.GetMeanPedWidth(t); - } - for(int t=0; t<44; t++){ fOOTPedestal[t] = calibda.GetOOTPed(t); fOOTPedWidth[t] = calibda.GetOOTPedWidth(t); fPedCorrCoeff[0][t] = calibda.GetPedCorrCoeff0(t); @@ -103,8 +99,8 @@ void AliZDCCalibData::Reset() // Reset memset(fMeanPedestal,0,47*sizeof(Float_t)); memset(fMeanPedWidth,0,47*sizeof(Float_t)); - memset(fOOTPedestal,0,44*sizeof(Float_t)); - memset(fOOTPedWidth,0,44*sizeof(Float_t)); + memset(fOOTPedestal,0,47*sizeof(Float_t)); + memset(fOOTPedWidth,0,47*sizeof(Float_t)); memset(fEnCalibration,0,6*sizeof(Float_t)); } @@ -114,7 +110,7 @@ void AliZDCCalibData::Print(Option_t *) const { // Printing of calibration object printf("\n ####### In-time pedestal values (mean value, sigma) ####### \n"); - for(int t=0; t<44; t++){ + for(int t=0; t<47; t++){ if(t==0 || t==24) printf("\n-------- ZN1 HighRes -------- \n"); else if(t==5 || t==29) printf("\n-------- ZN1 LowRes -------- \n"); else if(t==10 || t==34) printf("\n-------- ZP1 HighRes -------- \n"); @@ -127,7 +123,7 @@ void AliZDCCalibData::Print(Option_t *) const } // printf("\n\n ####### Out-of-time pedestal values (mean value, sigma) ####### \n"); - for(int t=0; t<44; t++){ + for(int t=0; t<47; t++){ if(t==0 || t==24) printf("\n-------- ZN1 HighRes -------- \n"); else if(t==5 || t==29) printf("\n-------- ZN1 LowRes -------- \n"); else if(t==10 || t==34) printf("\n-------- ZP1 HighRes -------- \n"); @@ -186,15 +182,15 @@ void AliZDCCalibData::SetMeanPedWidth(Float_t* MeanPedWidth) //________________________________________________________________ void AliZDCCalibData::SetOOTPed(Float_t* OOTPed) { - if(OOTPed) for(int t=0; t<44; t++) fOOTPedestal[t] = OOTPed[t]; - else for(int t=0; t<44; t++) fOOTPedestal[t] = 0.; + if(OOTPed) for(int t=0; t<47; t++) fOOTPedestal[t] = OOTPed[t]; + else for(int t=0; t<47; t++) fOOTPedestal[t] = 0.; } //________________________________________________________________ void AliZDCCalibData::SetOOTPedWidth(Float_t* OOTPedWidth) { - if(OOTPedWidth) for(int t=0; t<44; t++) fOOTPedWidth[t] = OOTPedWidth[t]; - else for(int t=0; t<44; t++) fOOTPedWidth[t] = 0.; + if(OOTPedWidth) for(int t=0; t<47; t++) fOOTPedWidth[t] = OOTPedWidth[t]; + else for(int t=0; t<47; t++) fOOTPedWidth[t] = 0.; } //________________________________________________________________ @@ -203,13 +199,13 @@ void AliZDCCalibData:: SetPedCorrCoeff(Float_t* PedCorrCoeff) // Set coefficients for pedestal correlations if(PedCorrCoeff){ for(Int_t j=0; j<2; j++){ - for(int t=0; t<44; t++) + for(int t=0; t<47; t++) fPedCorrCoeff[j][t] = PedCorrCoeff[t]; } } else{ for(Int_t j=0; j<2; j++){ - for(int t=0; t<44; t++) + for(int t=0; t<47; t++) fPedCorrCoeff[j][t] = 0.; } } @@ -221,13 +217,13 @@ void AliZDCCalibData:: SetPedCorrCoeff(Float_t* PedCorrCoeff0, Float_t* PedCorrC { // Set coefficients for pedestal correlations if(PedCorrCoeff0 && PedCorrCoeff1){ - for(int t=0; t<44; t++){ + for(int t=0; t<47; t++){ fPedCorrCoeff[0][t] = PedCorrCoeff0[t]; fPedCorrCoeff[0][t] = PedCorrCoeff1[t]; } } else{ - for(int t=0; t<44; t++){ + for(int t=0; t<47; t++){ fPedCorrCoeff[0][t] = 0.; fPedCorrCoeff[1][t] = 0.; } diff --git a/ZDC/AliZDCCalibData.h b/ZDC/AliZDCCalibData.h index aacf98bb334..e67063b2c95 100644 --- a/ZDC/AliZDCCalibData.h +++ b/ZDC/AliZDCCalibData.h @@ -100,10 +100,10 @@ class AliZDCCalibData: public TNamed { protected: // --- Pedestals Float_t fMeanPedestal[47]; // Mean pedestal values - Float_t fMeanPedWidth[47]; // Mean pedestal values - Float_t fOOTPedestal[44]; // "Out of Time" pedestal values - Float_t fOOTPedWidth[44]; // "Out of Time" pedestal values - Float_t fPedCorrCoeff[2][44]; // Fit of correlation in-time vs. out-of-time + Float_t fMeanPedWidth[47]; // Mean pedestal widths + Float_t fOOTPedestal[47]; // "Out of Time" pedestal values + Float_t fOOTPedWidth[47]; // "Out of Time" pedestal widths + Float_t fPedCorrCoeff[2][47]; // Fit of correlation in-time vs. out-of-time // --- E calibration Float_t fEnCalibration[6]; // Coeff. for energy calibration // --- Coefficients for tower calibration @@ -124,7 +124,7 @@ class AliZDCCalibData: public TNamed { Float_t fEZP2MaxValue; // Max value of ZP2 vs. Nspec p correlation Float_t fEZDC2MaxValue; // Max value of ZDC2 vs. Nspec n+p correlation // - ClassDef(AliZDCCalibData,9) // ZDC Calibration data + ClassDef(AliZDCCalibData,10) // ZDC Calibration data }; #endif -- 2.39.3