#include "AliZDCEnCalib.h"
#include "AliZDCTowerCalib.h"
#include "AliZDCMBCalib.h"
+#include "AliZDCTDCCalib.h"
#include "AliZDCRecoParam.h"
#include "AliZDCRecoParampp.h"
#include "AliZDCRecoParamPbPb.h"
fPedData(GetPedestalData()),
fEnCalibData(GetEnergyCalibData()),
fTowCalibData(GetTowerCalibData()),
+ fTDCCalibData(GetTDCCalibData()),
fRecoMode(0),
fBeamEnergy(0.),
fNRun(0),
}*/
fBeamEnergy = GetRunInfo()->GetBeamEnergy();
- if(fBeamEnergy<0.01) AliWarning(" Beam energy value missing -> E_beam = 0");
-
+ if(fBeamEnergy<0.01){
+ AliWarning(" Beam energy value missing -> setting it to 1380 GeV ");
+ fBeamEnergy = 1380.;
+ }
+
if(((beamType.CompareTo("pp"))==0) || ((beamType.CompareTo("p-p"))==0)
||((beamType.CompareTo("PP"))==0) || ((beamType.CompareTo("P-P"))==0)){
fRecoMode=1;
fMeanPhase = phaseLHC->GetMeanPhaseB1();
if(fIsCalibrationMB==kFALSE)
- printf("\n\n ***** ZDC reconstruction initialized for %s @ %1.0f + %1.0f GeV *****\n\n",
- beamType.Data(), fBeamEnergy, fBeamEnergy);
+ AliInfo(Form("\n\n ***** ZDC reconstruction initialized for %s @ %1.0f + %1.0f GeV *****\n\n",
+ beamType.Data(), fBeamEnergy, fBeamEnergy));
// if EMD calibration run NO ENERGY CALIBRATION should be performed
// pp-like reconstruction must be performed (E cailb. coeff. = 1)
fBeamEnergy = 1380.;
}
+ AliInfo(Form("\n ZDC reconstruction mode %d (1 -> p-p, 2-> A-A)\n\n",fRecoMode));
+
fESDZDC = new AliESDZDC();
}
fESDZDC = new AliESDZDC();
- printf("\n\n ***** ZDC reconstruction initialized for %s @ %1.0f + %1.0f GeV *****\n\n",
- beamType.Data(), fBeamEnergy, fBeamEnergy);
+ AliInfo(Form("\n\n ***** ZDC reconstruction initialized for %s @ %1.0f + %1.0f GeV *****\n\n",
+ beamType.Data(), fBeamEnergy, fBeamEnergy));
}
if(det == 1){ // *** ZNC
tZN1Corr[quad] = (Float_t) (digit.GetADCValue(0)-ped2SubHg);
tZN1Corr[quad+5] = (Float_t) (digit.GetADCValue(1)-ped2SubLg);
- if(tZN1Corr[quad]<0.) tZN1Corr[quad] = 0.;
- if(tZN1Corr[quad+5]<0.) tZN1Corr[quad+5] = 0.;
}
else if(det == 2){ // *** ZP1
tZP1Corr[quad] = (Float_t) (digit.GetADCValue(0)-ped2SubHg);
tZP1Corr[quad+5] = (Float_t) (digit.GetADCValue(1)-ped2SubLg);
- if(tZP1Corr[quad]<0.) tZP1Corr[quad] = 0.;
- if(tZP1Corr[quad+5]<0.) tZP1Corr[quad+5] = 0.;
}
else if(det == 3){
if(quad == 1){ // *** ZEM1
dZEM1Corr[0] += (Float_t) (digit.GetADCValue(0)-ped2SubHg);
dZEM1Corr[1] += (Float_t) (digit.GetADCValue(1)-ped2SubLg);
- if(dZEM1Corr[0]<0.) dZEM1Corr[0] = 0.;
- if(dZEM1Corr[1]<0.) dZEM1Corr[1] = 0.;
}
else if(quad == 2){ // *** ZEM2
dZEM2Corr[0] += (Float_t) (digit.GetADCValue(0)-ped2SubHg);
dZEM2Corr[1] += (Float_t) (digit.GetADCValue(1)-ped2SubLg);
- if(dZEM2Corr[0]<0.) dZEM2Corr[0] = 0.;
- if(dZEM2Corr[1]<0.) dZEM2Corr[1] = 0.;
}
}
else if(det == 4){ // *** ZN2
tZN2Corr[quad] = (Float_t) (digit.GetADCValue(0)-ped2SubHg);
tZN2Corr[quad+5] = (Float_t) (digit.GetADCValue(1)-ped2SubLg);
- if(tZN2Corr[quad]<0.) tZN2Corr[quad] = 0.;
- if(tZN2Corr[quad+5]<0.) tZN2Corr[quad+5] = 0.;
}
else if(det == 5){ // *** ZP2
tZP2Corr[quad] = (Float_t) (digit.GetADCValue(0)-ped2SubHg);
tZP2Corr[quad+5] = (Float_t) (digit.GetADCValue(1)-ped2SubLg);
- if(tZP2Corr[quad]<0.) tZP2Corr[quad] = 0.;
- if(tZP2Corr[quad+5]<0.) tZP2Corr[quad+5] = 0.;
}
}
else{ // Reference PMs
if(det == 1){
sPMRef1[0] = (Float_t) (digit.GetADCValue(0)-ped2SubHg);
sPMRef1[1] = (Float_t) (digit.GetADCValue(1)-ped2SubLg);
- // Ch. debug
- if(sPMRef1[0]<0.) sPMRef1[0] = 0.;
- if(sPMRef2[1]<0.) sPMRef1[1] = 0.;
}
else if(det == 4){
sPMRef2[0] = (Float_t) (digit.GetADCValue(0)-ped2SubHg);
sPMRef2[1] = (Float_t) (digit.GetADCValue(1)-ped2SubLg);
- // Ch. debug
- if(sPMRef2[0]<0.) sPMRef2[0] = 0.;
- if(sPMRef2[1]<0.) sPMRef2[1] = 0.;
}
}
// **** Pb-Pb data taking 2010 -> subtracting some ch. from correlation ****
// Not interested in o.o.t. signals (ADC modules 2, 3)
//if(adcMod == 2 || adcMod == 3) continue;
- if(((det==1 && quad==0) || (det==2 && quad==2) || (det==3)) && (quad != 5)){
- if(det == 1){
- if(adcMod==0 || adcMod==1){
- if(gain==0) adcZN1[quad] = rawData.GetADCValue();
- else adcZN1lg[quad] = rawData.GetADCValue();
- }
- else if(adcMod==2 || adcMod==3){
- if(gain==0) adcZN1oot[quad] = rawData.GetADCValue();
- else adcZN1ootlg[quad] = rawData.GetADCValue();
- }
- }
- else if(det == 2){
- if(adcMod==0 || adcMod==1){
- if(gain==0) adcZP2[quad] = rawData.GetADCValue();
- else adcZP2lg[quad] = rawData.GetADCValue();
- }
- else if(adcMod==2 || adcMod==3){
- if(gain==0) adcZP2oot[quad] = rawData.GetADCValue();
- else adcZP2ootlg[quad] = rawData.GetADCValue();
- }
+ // **** Pb-Pb data taking 2011 -> subtracting only ZEM from correlation ****
+ if(det==3){
+ if(adcMod==0 || adcMod==1){
+ if(gain==0) adcZEM[quad-1] = rawData.GetADCValue();
+ else adcZEMlg[quad-1] = rawData.GetADCValue();
}
- else if(det == 3){
- if(adcMod==0 || adcMod==1){
- if(gain==0) adcZEM[quad-1] = rawData.GetADCValue();
- else adcZEMlg[quad-1] = rawData.GetADCValue();
- }
- else if(adcMod==2 || adcMod==3){
- if(gain==0) adcZEMoot[quad-1] = rawData.GetADCValue();
- else adcZEMootlg[quad-1] = rawData.GetADCValue();
- }
+ else if(adcMod==2 || adcMod==3){
+ if(gain==0) adcZEMoot[quad-1] = rawData.GetADCValue();
+ else adcZEMootlg[quad-1] = rawData.GetADCValue();
}
}
// When oot values are read the ADC modules 2, 3 can be skipped!!!
// *************************************************************************
if(quad != 5){ // ZDCs (not reference PTMs)
- if(det==1 && quad!=0){
+ if(det==1){
pedindex = quad;
if(gain == 0) tZN1Corr[quad] += (Float_t) (rawData.GetADCValue()-meanPed[pedindex]);
else tZN1Corr[quad+5] += (Float_t) (rawData.GetADCValue()-meanPed[pedindex+kNch]);
}
- else if(det==2 && quad!=2){
+ else if(det==2){
pedindex = quad+5;
if(gain == 0) tZP1Corr[quad] += (Float_t) (rawData.GetADCValue()-meanPed[pedindex]);
else tZP1Corr[quad+5] += (Float_t) (rawData.GetADCValue()-meanPed[pedindex+kNch]);
}// ADC DATA
// ***************************** Reading Scaler
else if(rawData.GetADCModule()==kScalerGeo){
- if(rawData.IsScalerWord()==kTRUE && rawData.IsScEventGood()==kTRUE){
+ if(rawData.IsScalerWord()==kTRUE){
isScalerOn = kTRUE;
scalerData[jsc] = rawData.GetTriggerCount();
// Ch. debug
if(itdc==iprevtdc) ihittdc++;
else ihittdc=0;
iprevtdc=itdc;
- tdcData[itdc][ihittdc] = rawData.GetZDCTDCDatum();
+ if(ihittdc<4) tdcData[itdc][ihittdc] = rawData.GetZDCTDCDatum();
// Ch. debug
- //printf(" Reconstructed TDC[%d, %d] %d ",itdc, ihittdc, tdcData[itdc][ihittdc]);
+ //if(ihittdc==0) printf(" TDC%d %d ",itdc, tdcData[itdc][ihittdc]);
}// ZDC TDC DATA
// ***************************** Reading PU
else if(rawData.GetADCModule()==kPUGeo){
sPMRef2[0] = pmRef[0] - (corrCoeff1[23]*pmRefoot[1]+corrCoeff0[23]);
sPMRef2[1] = pmReflg[0] - (corrCoeff1[23+kNch]*pmRefootlg[1]+corrCoeff0[23+kNch]);
}
- else{
- // **** Pb-Pb data taking 2010 -> subtracting some ch. from correlation ****
- tZN1Corr[0] = adcZN1[0] - (corrCoeff1[0]*adcZN1oot[0]+corrCoeff0[0]);
- tZN1Corr[5] = adcZN1lg[0] - (corrCoeff1[kNch]*adcZN1ootlg[0]+corrCoeff0[kNch]);
+ if(fPedSubMode==0 && fRecoMode==2){
+ // **** Pb-Pb data taking 2011 -> subtracting some ch. from correlation ****
+ //tZN1Corr[0] = adcZN1[0] - (corrCoeff1[0]*adcZN1oot[0]+corrCoeff0[0]);
+ //tZN1Corr[5] = adcZN1lg[0] - (corrCoeff1[kNch]*adcZN1ootlg[0]+corrCoeff0[kNch]);
// Ch. debug
//printf(" adcZN1 %d adcZN1oot %d tZN1Corr %1.2f \n", adcZN1[0],adcZN1oot[0],tZN1Corr[0]);
//printf(" adcZN1lg %d adcZN1ootlg %d tZN1Corrlg %1.2f \n", adcZN1lg[0],adcZN1ootlg[0],tZN1Corr[5]);
//
- tZP1Corr[2] = adcZP1[2] - (corrCoeff1[2+5]*adcZP1oot[2]+corrCoeff0[2+5]);
- tZP1Corr[2+5] = adcZP1lg[2] - (corrCoeff1[2+5+kNch]*adcZP1ootlg[2]+corrCoeff0[2+5+kNch]);
+ //tZP1Corr[2] = adcZP1[2] - (corrCoeff1[2+5]*adcZP1oot[2]+corrCoeff0[2+5]);
+ //tZP1Corr[2+5] = adcZP1lg[2] - (corrCoeff1[2+5+kNch]*adcZP1ootlg[2]+corrCoeff0[2+5+kNch]);
//
dZEM1Corr[0] = adcZEM[0] - (corrCoeff1[10]*adcZEMoot[0]+corrCoeff0[10]);
dZEM1Corr[1] = adcZEMlg[0] - (corrCoeff1[10+kNch]*adcZEMootlg[0]+corrCoeff0[10+kNch]);
dZEM2Corr[1] = adcZEMlg[1] - (corrCoeff1[11+kNch]*adcZEMootlg[1]+corrCoeff0[11+kNch]);
// *************************************************************************
}
+ else if(fPedSubMode==0 && fRecoMode==1){
+ // **** p-p data taking 2011 -> temporary patch to overcome DA problem ****
+ tZN1Corr[0] = adcZN1[0] - meanPed[0];
+ tZN1Corr[5] = adcZN1lg[0] - meanPed[kNch];
+ //
+ dZEM1Corr[0] = adcZEM[0] - meanPed[10];
+ dZEM1Corr[1] = adcZEMlg[0] - meanPed[10+kNch];
+ dZEM2Corr[0] = adcZEM[1] - meanPed[11];
+ dZEM2Corr[1] = adcZEMlg[1] - meanPed[11+kNch];
+ // *************************************************************************
+ }
if(fRecoMode==1) // p-p data
ReconstructEventpp(clustersTree, tZN1Corr, tZP1Corr, tZN2Corr, tZP2Corr,
Int_t nPart=0, nPartTotLeft=0, nPartTotRight=0;
Double_t impPar=0., impPar1=0., impPar2=0.;
+ Bool_t energyFlag = kFALSE;
// create the output tree
AliZDCReco* reco = new AliZDCReco(calibSumZN1, calibSumZP1, calibSumZN2, calibSumZP2,
calibTowZN1, calibTowZP1, calibTowZN2, calibTowZP2,
nGenSpec, nGenSpecLeft, nGenSpecRight,
nPart, nPartTotLeft, nPartTotRight,
impPar, impPar1, impPar2,
- recoFlag, isScalerOn, scaler, tdcData);
+ recoFlag, energyFlag, isScalerOn, scaler, tdcData);
const Int_t kBufferSize = 4000;
clustersTree->Branch("ZDC", "AliZDCReco", &reco, kBufferSize);
Double_t b=0., bA=0., bC=0.;
if(fIsCalibrationMB == kFALSE){
- // ****** Reconstruction parameters ------------------
-
if(!fgRecoParam) fgRecoParam = const_cast<AliZDCRecoParam*>(GetRecoParam());
- if(!fgRecoParam){
- AliError(" RecoParam object not retrieved correctly: not reconstructing event!!!");
- return;
- }
- TH1D* hNpartDist = fgRecoParam->GethNpartDist();
- TH1D* hbDist = fgRecoParam->GethbDist();
- Float_t fClkCenter = fgRecoParam->GetClkCenter();
- if(!hNpartDist || !hbDist){
- AliError("Something wrong in Glauber MC histos got from AliZDCREcoParamPbPb: NO EVENT RECO FOR ZDC DATA!!!\n\n");
- return;
- }
-
+ // ****** Reconstruction parameters ------------------
+ if(!fgRecoParam) fgRecoParam = const_cast<AliZDCRecoParam*>(GetRecoParam());
+ if(!fgRecoParam){
+ AliError(" RecoParam object not retrieved correctly: not reconstructing ZDC event!!!");
+ return;
+ }
+ TH1D* hNpartDist = fgRecoParam->GethNpartDist();
+ TH1D* hbDist = fgRecoParam->GethbDist();
+ Float_t fClkCenter = fgRecoParam->GetClkCenter();
+ if(!hNpartDist || !hbDist){
+ AliError("Something wrong in Glauber MC histos got from AliZDCREcoParamPbPb: NO EVENT RECO FOR ZDC DATA!!!\n\n");
+ //return;
+ }
+ else{
if(!fgMBCalibData) fgMBCalibData = const_cast<AliZDCMBCalib*>(GetMBCalibData());
TH2F *hZDCvsZEM = fgMBCalibData->GethZDCvsZEM();
TH2F *hZDCCvsZEM = fgMBCalibData->GethZDCCvsZEM();
delete line;
delete lineC; delete lineA;
-
+ }
} // ONLY IF fIsCalibrationMB==kFALSE
+ Bool_t energyFlag = kTRUE;
AliZDCReco* reco = new AliZDCReco(calibSumZN1, calibSumZP1, calibSumZN2, calibSumZP2,
calibTowZN1, calibTowZP1, calibTowZN2, calibTowZP2,
calibZEM1, calibZEM2, sPMRef1, sPMRef2,
nDetSpecNLeft, nDetSpecPLeft, nDetSpecNRight, nDetSpecPRight,
nGenSpec, nGenSpecA, nGenSpecC,
nPart, nPartA, nPartC, b, bA, bC,
- recoFlag, isScalerOn, scaler, tdcData);
+ recoFlag, energyFlag, isScalerOn, scaler, tdcData);
const Int_t kBufferSize = 4000;
clustersTree->Branch("ZDC", "AliZDCReco", &reco, kBufferSize);
{
// fill energies and number of participants to the ESD
+ // Retrieving TDC calibration data
+ // Parameters for TDC centering around zero
+ int const knTDC = 6;
+ Float_t tdcOffset[knTDC];
+ for(Int_t jj=0; jj<knTDC; jj++) tdcOffset[jj] = fTDCCalibData->GetMeanTDC(jj);
+ //fTDCCalibData->Print("");
+
AliZDCReco reco;
AliZDCReco* preco = &reco;
clustersTree->SetBranchAddress("ZDC", &preco);
fESDZDC->SetZDCScaler(counts);
}
- // Writing TDC data into ZDC ESDs
Int_t tdcValues[32][4];
Float_t tdcCorrected[32][4];
for(Int_t jk=0; jk<32; jk++){
for(Int_t lk=0; lk<4; lk++){
tdcValues[jk][lk] = reco.GetZDCTDCData(jk, lk);
+ //Ch debug
+ //if((jk>=8 && jk<=13 && lk==0) || jk==15) printf(" *** ZDC: tdc%d = %d = %f ns \n",jk,tdcValues[jk][lk],0.025*tdcValues[jk][lk]);
}
}
+
+ // Writing TDC data into ZDC ESDs
// 4/2/2011 -> Subtracting L0 (tdcValues[15]) instead of ADC gate
// we try to keep the TDC oscillations as low as possible!
for(Int_t jk=0; jk<32; jk++){
for(Int_t lk=0; lk<4; lk++){
- if(tdcValues[jk][lk]!=0.) tdcCorrected[jk][lk] = 0.025*(tdcValues[jk][lk]-tdcValues[15][0])+fMeanPhase;
+ if(TMath::Abs(tdcValues[jk][lk])>1e-10){
+ tdcCorrected[jk][lk] = 0.025*(tdcValues[jk][lk]-tdcValues[15][0])+fMeanPhase;
+ // Sep 2011: TDC ch. from 8 to 13 centered around 0 using OCDB
+ if(jk>=8 && jk<=13) tdcCorrected[jk][lk] = tdcCorrected[jk][lk] - tdcOffset[jk-8];
+ //Ch. debug
+ //if(jk>=8 && jk<=13) printf(" *** tdcOffset%d %f tdcCorr%d %f \n",jk,tdcOffset[jk-8],tdcCorrected[jk][lk]);
+
+ }
}
}
+
fESDZDC->SetZDCTDCData(tdcValues);
fESDZDC->SetZDCTDCCorrected(tdcCorrected);
- fESDZDC->AliESDZDC::SetBit(AliESDZDC::kCorrectedTDCFilled, kTRUE);
+ fESDZDC->AliESDZDC::SetBit(AliESDZDC::kCorrectedTDCFilled, reco.GetEnergyFlag());
+ fESDZDC->AliESDZDC::SetBit(AliESDZDC::kEnergyCalibratedSignal, kTRUE);
if(esd) esd->SetZDCData(fESDZDC);
}
return calibdata;
}
+
+//_____________________________________________________________________________
+AliZDCTDCCalib* AliZDCReconstructor::GetTDCCalibData() const
+{
+
+ // Getting TDC object for ZDC
+
+ AliCDBEntry *entry = AliCDBManager::Instance()->Get("ZDC/Calib/TDCCalib");
+ if(!entry) AliFatal("No calibration data loaded!");
+ entry->SetOwner(kFALSE);
+
+ AliZDCTDCCalib *calibdata = dynamic_cast<AliZDCTDCCalib*> (entry->GetObject());
+ if(!calibdata) AliFatal("Wrong calibration object in calibration file!");
+
+ return calibdata;
+}
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff