#include "AliZDCPedestals.h"
#include "AliZDCEnCalib.h"
#include "AliZDCTowerCalib.h"
+#include "AliZDCMBCalib.h"
#include "AliZDCRecoParam.h"
#include "AliZDCRecoParampp.h"
#include "AliZDCRecoParamPbPb.h"
ClassImp(AliZDCReconstructor)
-AliZDCRecoParam *AliZDCReconstructor::fRecoParam=0; //reconstruction parameters
+AliZDCRecoParam *AliZDCReconstructor::fgRecoParam=0; //reconstruction parameters
+AliZDCMBCalib *AliZDCReconstructor::fgMBCalibData=0; //calibration parameters for A-A reconstruction
//_____________________________________________________________________________
AliZDCReconstructor:: AliZDCReconstructor() :
AliZDCReconstructor::~AliZDCReconstructor()
{
// destructor
-// if(fRecoParam) delete fRecoParam;
+// if(fgRecoParam) delete fgRecoParam;
if(fPedData) delete fPedData;
if(fEnCalibData) delete fEnCalibData;
if(fTowCalibData) delete fTowCalibData;
+ if(fgMBCalibData) delete fgMBCalibData;
}
//____________________________________________________________________________
TString beamType = GetRunInfo()->GetBeamType();
// This is a temporary solution to allow reconstruction in tests without beam
- if(((beamType.CompareTo("UNKNOWN"))==0) && ((runType.CompareTo("PHYSICS")) == 0)){
+ if(((beamType.CompareTo("UNKNOWN"))==0) &&
+ ((runType.CompareTo("PHYSICS"))==0 || (runType.CompareTo("CALIBRATION_BC"))==0)){
fRecoMode=1;
}
/*else if((beamType.CompareTo("UNKNOWN"))==0){
||((beamType.CompareTo("PP"))==0) || ((beamType.CompareTo("P-P"))==0)){
fRecoMode=1;
}
- else if((beamType.CompareTo("A-A")) == 0){
+ else if((beamType.CompareTo("A-A")) == 0 || (beamType.CompareTo("AA")) == 0){
fRecoMode=2;
}
fBeamEnergy = GetRunInfo()->GetBeamEnergy();
- if(fBeamEnergy==0.){
- AliWarning(" Beam energy value missing -> E_beam = 0");
- fBeamEnergy = 0.;
- }
+ if(fBeamEnergy<0.01) AliWarning(" Beam energy value missing -> E_beam = 0");
if(fIsCalibrationMB==kFALSE)
- printf("\n\n ***** ZDC reconstruction initialized for %s @ %1.0f GeV *****\n\n",beamType.Data(), fBeamEnergy);
+ printf("\n\n ***** ZDC reconstruction initialized for %s @ %1.0f + %1.0f GeV *****\n\n",
+ beamType.Data(), fBeamEnergy, fBeamEnergy);
}
}
Int_t digNentries = digitsTree->GetEntries();
- Float_t ootDigi[kNch];
+ Float_t ootDigi[kNch]; Int_t i=0;
// -- Reading out-of-time signals (last kNch entries) for current event
if(fPedSubMode==1){
for(Int_t iDigit=kNch; iDigit<digNentries; iDigit++){
- ootDigi[iDigit] = digitsTree->GetEntry(iDigit);
+ if(i<=kNch) ootDigi[i] = digitsTree->GetEntry(iDigit);
+ else AliWarning(" Can't read more out of time values: index>kNch !!!\n");
+ i++;
}
}
}//digits loop
UInt_t counts[32];
- for(Int_t jj=0; jj<32; jj++) counts[jj]=0;
+ Int_t tdc[32];
+ for(Int_t jj=0; jj<32; jj++){
+ counts[jj]=0;
+ tdc[jj]=0;
+ }
Int_t evQualityBlock[4] = {1,0,0,0};
Int_t triggerBlock[4] = {0,0,0,0};
if(fRecoMode==1)
ReconstructEventpp(clustersTree, tZN1Corr, tZP1Corr, tZN2Corr, tZP2Corr,
dZEM1Corr, dZEM2Corr, sPMRef1, sPMRef2,
- kFALSE, counts,
+ kFALSE, counts, tdc,
evQualityBlock, triggerBlock, chBlock, puBits);
else if(fRecoMode==2)
ReconstructEventPbPb(clustersTree, tZN1Corr, tZP1Corr, tZN2Corr, tZP2Corr,
dZEM1Corr, dZEM2Corr, sPMRef1, sPMRef2,
- kFALSE, counts,
- evQualityBlock, triggerBlock, chBlock, puBits);
+ kFALSE, counts, tdc,
+ evQualityBlock, triggerBlock, chBlock, puBits);
}
//_____________________________________________________________________________
}
Bool_t isScalerOn=kFALSE;
- Int_t jsc=0;
- UInt_t scalerData[32];
- for(Int_t k=0; k<32; k++) scalerData[k]=0;
+ Int_t jsc=0, itdc=0;
+ UInt_t scalerData[32];
+ Int_t tdcData[32];
+ for(Int_t k=0; k<32; k++){
+ scalerData[k]=0;
+ tdcData[k]=0;
+ }
Int_t evQualityBlock[4] = {1,0,0,0};
Int_t triggerBlock[4] = {0,0,0,0};
UInt_t puBits=0;
//fNRun = (Int_t) rawReader->GetRunNumber();
- Int_t kFirstADCGeo=0, kLastADCGeo=3, kScalerGeo=8, kPUGeo=29;
+ Int_t kFirstADCGeo=0, kLastADCGeo=3, kScalerGeo=8, kZDCTDCGeo=4, kPUGeo=29;
//Int_t kTrigScales=30, kTrigHistory=31;
// loop over raw data
}// ADC DATA
// ***************************** Reading Scaler
else if(rawData.GetADCModule()==kScalerGeo){
- if(rawData.IsScHeaderRead()==kTRUE && rawData.IsScEventGood()==kTRUE){
+ if(rawData.IsScalerWord()==kTRUE && rawData.IsScEventGood()==kTRUE){
isScalerOn = kTRUE;
scalerData[jsc] = rawData.GetTriggerCount();
+ // Ch. debug
+ //printf(" Reconstructed VME Scaler: %d %d ",jsc,scalerData[jsc]);
+ //
jsc++;
}
}// VME SCALER DATA
+ // ***************************** Reading ZDC TDC
+ else if(rawData.GetADCModule()==kZDCTDCGeo && rawData.IsZDCTDCDatum()==kTRUE){
+ tdcData[itdc] = rawData.GetZDCTDCDatum();
+ // Ch. debug
+ //printf(" Reconstructed VME Scaler: %d %d ",jsc,scalerData[jsc]);
+ //
+ itdc++;
+ }// ZDC TDC DATA
// ***************************** Reading PU
else if(rawData.GetADCModule()==kPUGeo){
puBits = rawData.GetDetectorPattern();
if(fRecoMode==1) // p-p data
ReconstructEventpp(clustersTree, tZN1Corr, tZP1Corr, tZN2Corr, tZP2Corr,
dZEM1Corr, dZEM2Corr, sPMRef1, sPMRef2,
- isScalerOn, scalerData,
+ isScalerOn, scalerData, tdcData,
evQualityBlock, triggerBlock, chBlock, puBits);
else if(fRecoMode==2) // Pb-Pb data
- ReconstructEventPbPb(clustersTree, tZN1Corr, tZP1Corr, tZN2Corr, tZP2Corr,
+ ReconstructEventPbPb(clustersTree, tZN1Corr, tZP1Corr, tZN2Corr, tZP2Corr,
dZEM1Corr, dZEM2Corr, sPMRef1, sPMRef2,
- isScalerOn, scalerData,
+ isScalerOn, scalerData, tdcData,
evQualityBlock, triggerBlock, chBlock, puBits);
}
//_____________________________________________________________________________
-void AliZDCReconstructor::ReconstructEventpp(TTree *clustersTree, Float_t* corrADCZN1,
- Float_t* corrADCZP1, Float_t* corrADCZN2, Float_t* corrADCZP2,
- Float_t* corrADCZEM1, Float_t* corrADCZEM2, Float_t* sPMRef1, Float_t* sPMRef2,
- Bool_t isScalerOn, UInt_t* scaler,
- Int_t* evQualityBlock, Int_t* triggerBlock, Int_t* chBlock, UInt_t puBits) const
+void AliZDCReconstructor::ReconstructEventpp(TTree *clustersTree,
+ const Float_t* const corrADCZN1, const Float_t* const corrADCZP1,
+ const Float_t* const corrADCZN2, const Float_t* const corrADCZP2,
+ const Float_t* const corrADCZEM1, const Float_t* const corrADCZEM2,
+ Float_t* sPMRef1, Float_t* sPMRef2, Bool_t isScalerOn, UInt_t* scaler,
+ Int_t* tdcData, const Int_t* const evQualityBlock,
+ const Int_t* const triggerBlock, const Int_t* const chBlock, UInt_t puBits) const
{
// ****************** Reconstruct one event ******************
equalCoeffZP2[ji] = fTowCalibData->GetZP2EqualCoeff(ji);
}
// --- Energy calibration factors ------------------------------------
- Float_t calibEne[4];
+ Float_t calibEne[6];
// **** Energy calibration coefficient set to 1
// **** (no trivial way to calibrate in p-p runs)
- for(Int_t ij=0; ij<4; ij++) calibEne[ij] = fEnCalibData->GetEnCalib(ij);
+ for(Int_t ij=0; ij<6; ij++) calibEne[ij] = fEnCalibData->GetEnCalib(ij);
// ****** Equalization of detector responses
Float_t equalTowZN1[10], equalTowZN2[10], equalTowZP1[10], equalTowZP2[10];
}
//
Float_t sumZEM[]={0,0}, calibZEM1[]={0,0}, calibZEM2[]={0,0};
- calibZEM1[0] = corrADCZEM1[0]*calibEne[5];
- calibZEM1[1] = corrADCZEM1[1]*calibEne[5];
+ calibZEM1[0] = corrADCZEM1[0]*calibEne[4];
+ calibZEM1[1] = corrADCZEM1[1]*calibEne[4];
calibZEM2[0] = corrADCZEM2[0]*calibEne[5];
calibZEM2[1] = corrADCZEM2[1]*calibEne[5];
for(Int_t k=0; k<2; k++) sumZEM[k] = calibZEM1[k] + calibZEM2[k];
nGenSpec, nGenSpecLeft, nGenSpecRight,
nPart, nPartTotLeft, nPartTotRight,
impPar, impPar1, impPar2,
- recoFlag, isScalerOn, scaler);
+ recoFlag, isScalerOn, scaler, tdcData);
const Int_t kBufferSize = 4000;
clustersTree->Branch("ZDC", "AliZDCReco", &reco, kBufferSize);
//_____________________________________________________________________________
void AliZDCReconstructor::ReconstructEventPbPb(TTree *clustersTree,
- Float_t* corrADCZN1, Float_t* corrADCZP1, Float_t* corrADCZN2, Float_t* corrADCZP2,
- Float_t* corrADCZEM1, Float_t* corrADCZEM2, Float_t* sPMRef1, Float_t* sPMRef2,
- Bool_t isScalerOn, UInt_t* scaler,
- Int_t* evQualityBlock, Int_t* triggerBlock, Int_t* chBlock, UInt_t puBits) const
+ const Float_t* const corrADCZN1, const Float_t* const corrADCZP1,
+ const Float_t* const corrADCZN2, const Float_t* const corrADCZP2,
+ const Float_t* const corrADCZEM1, const Float_t* const corrADCZEM2,
+ Float_t* sPMRef1, Float_t* sPMRef2, Bool_t isScalerOn, UInt_t* scaler,
+ Int_t* tdcData, const Int_t* const evQualityBlock,
+ const Int_t* const triggerBlock, const Int_t* const chBlock, UInt_t puBits) const
{
// ****************** Reconstruct one event ******************
// ---------------------- Setting reco flags for ESD
rFlags[3] << 3 | rFlags[2] << 2 | rFlags[1] << 1 | rFlags[0];
// --------------------------------------------------
-
+
+ // CH. debug
+/* printf("\n*************************************************\n");
+ printf(" ReconstructEventPbPb -> values after pedestal subtraction:\n");
+ printf(" ADCZN1 [%1.2f %1.2f %1.2f %1.2f %1.2f]\n",
+ corrADCZN1[0],corrADCZN1[1],corrADCZN1[2],corrADCZN1[3],corrADCZN1[4]);
+ printf(" ADCZP1 [%1.2f %1.2f %1.2f %1.2f %1.2f]\n",
+ corrADCZP1[0],corrADCZP1[1],corrADCZP1[2],corrADCZP1[3],corrADCZP1[4]);
+ printf(" ADCZN2 [%1.2f %1.2f %1.2f %1.2f %1.2f]\n",
+ corrADCZN2[0],corrADCZN2[1],corrADCZN2[2],corrADCZN2[3],corrADCZN2[4]);
+ printf(" ADCZP2 [%1.2f %1.2f %1.2f %1.2f %1.2f]\n",
+ corrADCZP2[0],corrADCZP2[1],corrADCZP2[2],corrADCZP2[3],corrADCZP2[4]);
+ printf(" ADCZEM1 [%1.2f] ADCZEM2 [%1.2f] \n",corrADCZEM1[0],corrADCZEM2[0]);
+ printf("*************************************************\n");
+*/
// ****** Retrieving calibration data
// --- Equalization coefficients ---------------------------------------------
Float_t equalCoeffZN1[5], equalCoeffZP1[5], equalCoeffZN2[5], equalCoeffZP2[5];
equalCoeffZP2[ji] = fTowCalibData->GetZP2EqualCoeff(ji);
}
// --- Energy calibration factors ------------------------------------
- Float_t valFromOCDB[6], calibEne[6];
- for(Int_t ij=0; ij<6; ij++){
- valFromOCDB[ij] = fEnCalibData->GetEnCalib(ij);
- if(ij<4){
- if(valFromOCDB[ij]!=0) calibEne[ij] = fBeamEnergy/valFromOCDB[ij];
- else AliWarning(" Value from OCDB for E calibration = 0 !!!\n");
- }
- else calibEne[ij] = valFromOCDB[ij];
- }
+ Float_t calibEne[6];
+ // The energy calibration object already takes into account of E_beam
+ // -> the value from the OCDB can be directly used (Jul 2010)
+ for(Int_t ij=0; ij<6; ij++) calibEne[ij] = fEnCalibData->GetEnCalib(ij);
// ****** Equalization of detector responses
Float_t equalTowZN1[10], equalTowZN2[10], equalTowZP1[10], equalTowZP2[10];
}
}
+ // Ch. debug
+/* printf("\n ------------- EQUALIZATION -------------\n");
+ printf(" ADCZN1 [%1.2f %1.2f %1.2f %1.2f %1.2f]\n",
+ equalTowZN1[0],equalTowZN1[1],equalTowZN1[2],equalTowZN1[3],equalTowZN1[4]);
+ printf(" ADCZP1 [%1.2f %1.2f %1.2f %1.2f %1.2f]\n",
+ equalTowZP1[0],equalTowZP1[1],equalTowZP1[2],equalTowZP1[3],equalTowZP1[4]);
+ printf(" ADCZN2 [%1.2f %1.2f %1.2f %1.2f %1.2f]\n",
+ equalTowZN2[0],equalTowZN2[1],equalTowZN2[2],equalTowZN2[3],equalTowZN2[4]);
+ printf(" ADCZP2 [%1.2f %1.2f %1.2f %1.2f %1.2f]\n",
+ equalTowZP2[0],equalTowZP2[1],equalTowZP2[2],equalTowZP2[3],equalTowZP2[4]);
+ printf(" ----------------------------------------\n");
+*/
+
// ****** Summed response for hadronic calorimeter (SUMMED and then CALIBRATED!)
Float_t calibSumZN1[]={0,0}, calibSumZN2[]={0,0}, calibSumZP1[]={0,0}, calibSumZP2[]={0,0};
for(Int_t gi=0; gi<5; gi++){
calibSumZN2[1] += equalTowZN2[gi+5];
calibSumZP2[1] += equalTowZP2[gi+5];
}
+ //
+ //fEnCalibData->Print("");
+
// High gain chain
calibSumZN1[0] = calibSumZN1[0]*calibEne[0]*8.;
calibSumZP1[0] = calibSumZP1[0]*calibEne[1]*8.;
calibSumZP2[1] = calibSumZP2[1]*calibEne[3];
//
Float_t sumZEM[]={0,0}, calibZEM1[]={0,0}, calibZEM2[]={0,0};
- calibZEM1[0] = corrADCZEM1[0]*calibEne[5]*8.;
- calibZEM1[1] = corrADCZEM1[1]*calibEne[5];
+ calibZEM1[0] = corrADCZEM1[0]*calibEne[4]*8.;
+ calibZEM1[1] = corrADCZEM1[1]*calibEne[4];
calibZEM2[0] = corrADCZEM2[0]*calibEne[5]*8.;
calibZEM2[1] = corrADCZEM2[1]*calibEne[5];
for(Int_t k=0; k<2; k++) sumZEM[k] = calibZEM1[k] + calibZEM2[k];
calibTowZN2[gi+5] = equalTowZN2[gi+5]*calibEne[2];
calibTowZP2[gi+5] = equalTowZP2[gi+5]*calibEne[3];
}
-
+
+ // Ch. debug
+/* printf("\n ------------- CALIBRATION -------------\n");
+ printf(" ADCZN1 [%1.2f %1.2f %1.2f %1.2f %1.2f]\n",
+ calibTowZN1[0],calibTowZN1[1],calibTowZN1[2],calibTowZN1[3],calibTowZN1[4]);
+ printf(" ADCZP1 [%1.2f %1.2f %1.2f %1.2f %1.2f]\n",
+ calibTowZP1[0],calibTowZP1[1],calibTowZP1[2],calibTowZP1[3],calibTowZP1[4]);
+ printf(" ADCZN2 [%1.2f %1.2f %1.2f %1.2f %1.2f]\n",
+ calibTowZN2[0],calibTowZN2[1],calibTowZN2[2],calibTowZN2[3],calibTowZN2[4]);
+ printf(" ADCZP2 [%1.2f %1.2f %1.2f %1.2f %1.2f]\n",
+ calibTowZP2[0],calibTowZP2[1],calibTowZP2[2],calibTowZP2[3],calibTowZP2[4]);
+ printf(" ADCZEM1 [%1.2f] ADCZEM2 [%1.2f] \n",calibZEM1[0],calibZEM2[0]);
+ printf(" ----------------------------------------\n");
+*/
// ****** Number of detected spectator nucleons
Int_t nDetSpecNLeft=0, nDetSpecPLeft=0, nDetSpecNRight=0, nDetSpecPRight=0;
- if(fBeamEnergy!=0){
+ if(fBeamEnergy>0.01){
nDetSpecNLeft = (Int_t) (calibSumZN1[0]/fBeamEnergy);
nDetSpecPLeft = (Int_t) (calibSumZP1[0]/fBeamEnergy);
nDetSpecNRight = (Int_t) (calibSumZN2[0]/fBeamEnergy);
nDetSpecPRight = (Int_t) (calibSumZP2[0]/fBeamEnergy);
}
else AliWarning(" ATTENTION!!! fBeamEnergy=0 -> N_spec will be ZERO!!! \n");
- /*printf("\n\t AliZDCReconstructor -> nDetSpecNLeft %d, nDetSpecPLeft %d,"
- " nDetSpecNRight %d, nDetSpecPRight %d\n",nDetSpecNLeft, nDetSpecPLeft,
- nDetSpecNRight, nDetSpecPRight);*/
+ printf("\n\t AliZDCReconstructor -> fBeamEnergy %1.0f: nDetSpecNsideA %d, nDetSpecPsideA %d,"
+ " nDetSpecNsideC %d, nDetSpecPsideC %d\n",fBeamEnergy,nDetSpecNLeft, nDetSpecPLeft,
+ nDetSpecNRight, nDetSpecPRight);
Int_t nGenSpec=0, nGenSpecA=0, nGenSpecC=0;
Int_t nPart=0, nPartA=0, nPartC=0;
if(fIsCalibrationMB == kFALSE){
// ****** Reconstruction parameters ------------------
- // Ch. debug
- //fRecoParam->Print("");
+ if(!fgMBCalibData) fgMBCalibData = const_cast<AliZDCMBCalib*>(GetMBCalibData());
+ if(!fgRecoParam) fgRecoParam = const_cast<AliZDCRecoParam*>(GetRecoParam());
+ fgRecoParam->SetGlauberMCDist(fBeamEnergy);
+
+ TH2F *hZDCvsZEM = fgMBCalibData->GethZDCvsZEM();
+ TH2F *hZDCCvsZEM = fgMBCalibData->GethZDCCvsZEM();
+ TH2F *hZDCAvsZEM = fgMBCalibData->GethZDCAvsZEM();
//
-
- if (!fRecoParam) fRecoParam = const_cast<AliZDCRecoParam*>(GetRecoParam());
-
- TH2F *hZDCvsZEM = fRecoParam->GethZDCvsZEM();
- TH2F *hZDCCvsZEM = fRecoParam->GethZDCCvsZEM();
- TH2F *hZDCAvsZEM = fRecoParam->GethZDCAvsZEM();
- TH1D *hNpartDist = fRecoParam->GethNpartDist();
- TH1D *hbDist = fRecoParam->GethbDist();
- Float_t ClkCenter = fRecoParam->GetClkCenter();
+ TH1D *hNpartDist = fgRecoParam->GethNpartDist();
+ TH1D *hbDist = fgRecoParam->GethbDist();
+ Float_t clkCenter = fgRecoParam->GetClkCenter();
//
Double_t xHighEdge = hZDCvsZEM->GetXaxis()->GetXmax();
- Double_t origin = xHighEdge*ClkCenter;
+ Double_t origin = xHighEdge*clkCenter;
// Ch. debug
//printf("\n\n xHighEdge %1.2f, origin %1.4f \n", xHighEdge, origin);
//
if(yBinCenter < (line->GetParameter(0)*xBinCenter + line->GetParameter(1))){
countPerc += hZDCvsZEM->GetBinContent(nbinx,nbiny);
// Ch. debug
- /*printf(" xBinCenter %1.3f, yBinCenter %1.0f, countPerc %1.0f\n",
- xBinCenter, yBinCenter, countPerc);*/
+ //printf(" xBinCenter %1.3f, yBinCenter %1.0f, countPerc %1.0f\n",
+ //xBinCenter, yBinCenter, countPerc);
}
}
else{
if(yBinCenter > (line->GetParameter(0)*xBinCenter + line->GetParameter(1))){
countPerc += hZDCvsZEM->GetBinContent(nbinx,nbiny);
// Ch. debug
- /*printf(" xBinCenter %1.3f, yBinCenter %1.0f, countPerc %1.0f\n",
- xBinCenter, yBinCenter, countPerc);*/
+ //printf(" xBinCenter %1.3f, yBinCenter %1.0f, countPerc %1.0f\n",
+ //xBinCenter, yBinCenter, countPerc);
}
}
}
nGenSpecA = 416 - nPartA;
if(nGenSpec>416) nGenSpec=416; if(nGenSpec<0) nGenSpec=0;
if(nGenSpecC>416) nGenSpecC=416; if(nGenSpecC<0) nGenSpecC=0;
- if(nGenSpecA>416) nGenSpecA=416; if(nGenSpecA<0) nGenSpecA=0;
-
- // Ch. debug
- /*printf("\n\t AliZDCReconstructor -> calibSumZN1[0] %1.0f, calibSumZP1[0] %1.0f,"
- " calibSumZN2[0] %1.0f, calibSumZP2[0] %1.0f, corrADCZEMHG %1.0f\n",
- calibSumZN1[0],calibSumZP1[0],calibSumZN2[0],calibSumZP2[0],corrADCZEMHG);
- printf("\t AliZDCReconstructor -> nGenSpecLeft %d nGenSpecRight %d\n",
- nGenSpecLeft, nGenSpecRight);
- printf("\t AliZDCReconstructor -> NpartL %d, NpartR %d, b %1.2f fm\n\n",nPartTotLeft, nPartTotRight, impPar);
- */
+ if(nGenSpecA>416) nGenSpecA=416; if(nGenSpecA<0) nGenSpecA=0;
delete lineC; delete lineA;
nDetSpecNLeft, nDetSpecPLeft, nDetSpecNRight, nDetSpecPRight,
nGenSpec, nGenSpecA, nGenSpecC,
nPart, nPartA, nPartC, b, bA, bC,
- recoFlag, isScalerOn, scaler);
+ recoFlag, isScalerOn, scaler, tdcData);
const Int_t kBufferSize = 4000;
clustersTree->Branch("ZDC", "AliZDCReco", &reco, kBufferSize);
- reco->Print("");
+ //reco->Print("");
// write the output tree
clustersTree->Fill();
}
-//_____________________________________________________________________________
-void AliZDCReconstructor::BuildRecoParam(Float_t ZDCC, Float_t ZDCA, Float_t ZEM) const
-{
- // Calculate RecoParam object for Pb-Pb data
- (fRecoParam->GethZDCvsZEM())->Fill(ZDCC+ZDCA, ZEM);
- (fRecoParam->GethZDCCvsZEM())->Fill(ZDCC, ZEM);
- (fRecoParam->GethZDCAvsZEM())->Fill(ZDCA, ZEM);
-
-}
//_____________________________________________________________________________
void AliZDCReconstructor::FillZDCintoESD(TTree *clustersTree, AliESDEvent* esd) const
for(Int_t jk=0; jk<32; jk++) counts[jk] = reco.GetZDCScaler(jk);
esd->SetZDCScaler(counts);
}
+
+ // Writing TDC data into ZDC ESDs
+ Int_t tdcValues[32];
+ for(Int_t jk=0; jk<32; jk++) tdcValues[jk] = reco.GetZDCTDCData(jk);
+ esd->SetZDCTDC(tdcValues);
}
//_____________________________________________________________________________
// Getting pedestal calibration object for ZDC set
AliCDBEntry *entry = AliCDBManager::Instance()->Get("ZDC/Calib/Pedestals");
- if(!entry) AliFatal("No calibration data loaded!");
+ if(!entry) AliFatal("No calibration data loaded!");
+ entry->SetOwner(kFALSE);
AliZDCPedestals *calibdata = dynamic_cast<AliZDCPedestals*> (entry->GetObject());
if(!calibdata) AliFatal("Wrong calibration object in calibration file!");
AliCDBEntry *entry = AliCDBManager::Instance()->Get("ZDC/Calib/EnergyCalib");
if(!entry) AliFatal("No calibration data loaded!");
+ entry->SetOwner(kFALSE);
AliZDCEnCalib *calibdata = dynamic_cast<AliZDCEnCalib*> (entry->GetObject());
if(!calibdata) AliFatal("Wrong calibration object in calibration file!");
AliCDBEntry *entry = AliCDBManager::Instance()->Get("ZDC/Calib/TowerCalib");
if(!entry) AliFatal("No calibration data loaded!");
+ entry->SetOwner(kFALSE);
AliZDCTowerCalib *calibdata = dynamic_cast<AliZDCTowerCalib*> (entry->GetObject());
if(!calibdata) AliFatal("Wrong calibration object in calibration file!");
}
//_____________________________________________________________________________
-AliZDCRecoParampp* AliZDCReconstructor::GetppRecoParamFromOCDB() const
+AliZDCMBCalib* AliZDCReconstructor::GetMBCalibData() const
{
- // Getting reconstruction parameters from OCDB
-
- AliCDBEntry *entry = AliCDBManager::Instance()->Get("ZDC/Calib/RecoParampp");
- if(!entry) AliFatal("No RecoParam data found in OCDB!");
-
- AliZDCRecoParampp *param = dynamic_cast<AliZDCRecoParampp*> (entry->GetObject());
- if(!param) AliFatal("No RecoParam object in OCDB entry!");
-
- return param;
-
-}
-
-//_____________________________________________________________________________
-AliZDCRecoParamPbPb* AliZDCReconstructor::GetPbPbRecoParamFromOCDB() const
-{
+ // Getting energy and equalization calibration object for ZDC set
- // Getting reconstruction parameters from OCDB
+ AliCDBEntry *entry = AliCDBManager::Instance()->Get("ZDC/Calib/MBCalib");
+ if(!entry) AliFatal("No calibration data loaded!");
+ entry->SetOwner(kFALSE);
- AliCDBEntry *entry = AliCDBManager::Instance()->Get("ZDC/Calib/RecoParamPbPb");
- if(!entry) AliFatal("No RecoParam data found in OCDB!");
-
- AliZDCRecoParamPbPb *param = dynamic_cast<AliZDCRecoParamPbPb*> (entry->GetObject());
- if(!param) AliFatal("No RecoParam object in OCDB entry!");
-
- return param;
+ AliZDCMBCalib *calibdata = dynamic_cast<AliZDCMBCalib*> (entry->GetObject());
+ if(!calibdata) AliFatal("Wrong calibration object in calibration file!");
+ return calibdata;
}
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff