#include <TTree.h>
#include <TObjArray.h>
#include <TClonesArray.h>
+#include <TSystem.h>
#include "AliLog.h"
#include "AliRunLoader.h"
#include "AliPMDcluster.h"
#include "AliPMDrecpoint1.h"
#include "AliPMDrechit.h"
+#include "AliPMDisocell.h"
#include "AliPMDRawStream.h"
#include "AliPMDCalibData.h"
#include "AliPMDPedestal.h"
#include "AliPMDddldata.h"
+#include "AliPMDHotData.h"
+#include "AliPMDRecoParam.h"
+#include "AliPMDReconstructor.h"
#include "AliDAQ.h"
#include "AliCDBManager.h"
fPMDLoader(0),
fCalibGain(GetCalibGain()),
fCalibPed(GetCalibPed()),
+ fCalibHot(GetCalibHot()),
+ fRecoParam(0x0),
fTreeD(0),
fTreeR(0),
fDigits(new TClonesArray("AliPMDdigit", 1000)),
fPMDLoader(runLoader->GetLoader("PMDLoader")),
fCalibGain(GetCalibGain()),
fCalibPed(GetCalibPed()),
+ fCalibHot(GetCalibHot()),
+ fRecoParam(0x0),
fTreeD(0),
fTreeR(0),
fDigits(new TClonesArray("AliPMDdigit", 1000)),
fPMDLoader(0),
fCalibGain(GetCalibGain()),
fCalibPed(GetCalibPed()),
+ fCalibHot(GetCalibHot()),
+ fRecoParam(0x0),
fTreeD(0),
fTreeR(0),
fDigits(NULL),
// Destructor
if (fDigits)
{
- fDigits->Clear();
+ fDigits->Clear();
}
if (fRecpoints)
{
Int_t idet;
Float_t clusdata[6];
+ AliPMDisocell *pmdiso = 0x0;
+
TObjArray *pmdcont = new TObjArray();
+ TObjArray *pmdisocell = new TObjArray();
+
AliPMDClustering *pmdclust = new AliPMDClusteringV1();
- pmdclust->SetEdepCut(fEcut);
+ // fetch the recoparam object from database
+ fRecoParam = AliPMDReconstructor::GetRecoParam();
+
+ if(fRecoParam == 0x0)
+ {
+ AliFatal("No Reco Param found for PMD!!!");
+ }
+
fRunLoader->GetEvent(ievt);
xpos, ypos));
continue;
}
+
+ // Hot cell - set the cell adc = 0
+ Float_t hotflag = fCalibHot->GetHotChannel(det,smn,xpos,ypos);
+ if (hotflag == 1) adc = 0;
// CALIBRATION
Float_t gain = fCalibGain->GetGainFact(det,smn,xpos,ypos);
// printf("adc = %d gain = %f\n",adc,gain);
adc = adc*gain;
//Int_t trno = pmddigit->GetTrackNumber();
- fCellADC[xpos][ypos] = (Double_t) adc;
+ fCellTrack[xpos][ypos] = pmddigit->GetTrackNumber();
+ fCellPid[xpos][ypos] = pmddigit->GetTrackPid();
+ fCellADC[xpos][ypos] = (Double_t) adc;
}
idet = det;
ismn = smn;
- pmdclust->DoClust(idet,ismn,fCellADC,pmdcont);
-
+
+ // Set the minimum noise cut per module before clustering
+
+ Int_t imod = idet*24 + ismn;
+ fEcut = fRecoParam->GetNoiseCut(imod); // default
+ // fEcut = fRecoParam->GetPbPbParam()->GetNoiseCut(imod);
+ // fEcut = fRecoParam->GetPPParam()->GetNoiseCut(imod);
+ // fEcut = fRecoParam->GetCosmicParam()->GetNoiseCut(imod);
+
+ pmdclust->SetEdepCut(fEcut);
+
+
+ pmdclust->DoClust(idet,ismn,fCellTrack,fCellPid,fCellADC,
+ pmdisocell,pmdcont);
+
Int_t nentries1 = pmdcont->GetEntries();
AliDebug(1,Form("Total number of clusters/module = %d",nentries1));
{
Int_t celldataX = pmdcl->GetClusCellX(ihit);
Int_t celldataY = pmdcl->GetClusCellY(ihit);
- AddRecHit(celldataX, celldataY);
+ Int_t celldataTr = pmdcl->GetClusCellTrack(ihit);
+ Int_t celldataPid = pmdcl->GetClusCellPid(ihit);
+ Float_t celldataAdc = pmdcl->GetClusCellAdc(ihit);
+ AddRecHit(celldataX, celldataY, celldataTr, celldataPid, celldataAdc);
}
branch2->Fill();
ResetRechit();
}
pmdcont->Delete();
+
+ // Added single isolated cell for offline gain calibration
+ nentries1 = pmdisocell->GetEntries();
+ AliDebug(1,Form("Total number of isolated single cell clusters = %d",nentries1));
+
+ for (Int_t ient1 = 0; ient1 < nentries1; ient1++)
+ {
+ pmdiso = (AliPMDisocell*)pmdisocell->UncheckedAt(ient1);
+ idet = pmdiso->GetDetector();
+ ismn = pmdiso->GetSmn();
+ clusdata[0] = (Float_t) pmdiso->GetRow();
+ clusdata[1] = (Float_t) pmdiso->GetCol();
+ clusdata[2] = pmdiso->GetADC();
+ clusdata[3] = 1.;
+ clusdata[4] = -99.;
+ clusdata[5] = -99.;
+
+ AddRecPoint(idet,ismn,clusdata);
+ }
+ pmdisocell->Delete();
branch1->Fill();
ResetRecpoint();
// delete the pointers
delete pmdclust;
delete pmdcont;
+ delete pmdisocell;
}
// ------------------------------------------------------------------------- //
Float_t clusdata[6];
AliPMDcluster *pmdcl = 0x0;
+ AliPMDisocell *pmdiso = 0x0;
TObjArray *pmdcont = new TObjArray();
+ TObjArray *pmdisocell = new TObjArray();
AliPMDClustering *pmdclust = new AliPMDClusteringV1();
- pmdclust->SetEdepCut(fEcut);
+ // Fetch the reco param object
+
+ fRecoParam = AliPMDReconstructor::GetRecoParam();
+ if(fRecoParam == 0x0)
+ {
+ AliFatal("No Reco Param found for PMD!!!");
+ }
+
AliPMDdigit *pmddigit;
TBranch *branch = digitsTree->GetBranch("PMDDigit");
Float_t adc1 = adc - (pedmean + 3.0*pedrms);
+ // Hot cell - set the cell adc = 0
+ Float_t hotflag = fCalibHot->GetHotChannel(det,smn,xpos,ypos);
+ if (hotflag == 1) adc1 = 0;
+
// CALIBRATION
Float_t gain = fCalibGain->GetGainFact(det,smn,xpos,ypos);
// printf("adc = %d gain = %f\n",adc,gain);
adc = adc1*gain;
- //Int_t trno = pmddigit->GetTrackNumber();
+ fCellTrack[xpos][ypos] = pmddigit->GetTrackNumber();
+ fCellPid[xpos][ypos] = pmddigit->GetTrackPid();
fCellADC[xpos][ypos] = (Double_t) adc;
totADCMod += (Int_t) adc;
if (totADCMod <= 0) continue;
- pmdclust->DoClust(idet,ismn,fCellADC,pmdcont);
+ // Set the minimum noise cut per module before clustering
+
+ Int_t imod = idet*24 + ismn;
+ fEcut = fRecoParam->GetNoiseCut(imod); // default
+ // fEcut = fRecoParam->GetPbPbParam()->GetNoiseCut(imod);
+ // fEcut = fRecoParam->GetPPParam()->GetNoiseCut(imod);
+ // fEcut = fRecoParam->GetCosmicParam()->GetNoiseCut(imod);
+
+
+ pmdclust->SetEdepCut(fEcut);
+
+ pmdclust->DoClust(idet,ismn,fCellTrack,fCellPid,fCellADC,
+ pmdisocell,pmdcont);
Int_t nentries1 = pmdcont->GetEntries();
for (Int_t ient1 = 0; ient1 < nentries1; ient1++)
{
- pmdcl = (AliPMDcluster*)pmdcont->UncheckedAt(ient1);
+ pmdcl = (AliPMDcluster*)pmdcont->UncheckedAt(ient1);
idet = pmdcl->GetDetector();
ismn = pmdcl->GetSMN();
clusdata[0] = pmdcl->GetClusX();
{
Int_t celldataX = pmdcl->GetClusCellX(ihit);
Int_t celldataY = pmdcl->GetClusCellY(ihit);
- AddRecHit(celldataX, celldataY);
+ Int_t celldataTr = pmdcl->GetClusCellTrack(ihit);
+ Int_t celldataPid = pmdcl->GetClusCellPid(ihit);
+ Float_t celldataAdc = pmdcl->GetClusCellAdc(ihit);
+ AddRecHit(celldataX, celldataY, celldataTr, celldataPid, celldataAdc);
}
branch2->Fill();
ResetRechit();
}
pmdcont->Delete();
+
+ // Added single isolated cell for offline gain calibration
+ nentries1 = pmdisocell->GetEntries();
+ AliDebug(1,Form("Total number of isolated single cell clusters = %d",nentries1));
+
+ for (Int_t ient1 = 0; ient1 < nentries1; ient1++)
+ {
+ pmdiso = (AliPMDisocell*)pmdisocell->UncheckedAt(ient1);
+ idet = pmdiso->GetDetector();
+ ismn = pmdiso->GetSmn();
+ clusdata[0] = (Float_t) pmdiso->GetRow();
+ clusdata[1] = (Float_t) pmdiso->GetCol();
+ clusdata[2] = pmdiso->GetADC();
+ clusdata[3] = 1.;
+ clusdata[4] = -99.;
+ clusdata[5] = -99.;
+
+ AddRecPoint(idet,ismn,clusdata);
+ }
+ pmdisocell->Delete();
branch1->Fill();
ResetRecpoint();
} // modules
+
ResetCellADC();
// delete the pointers
delete pmdclust;
delete pmdcont;
-
+ delete pmdisocell;
}
// ------------------------------------------------------------------------- //
// This method is called at the time of reconstruction from RAW data
- AliPMDddldata *pmdddl = 0x0;
- AliPMDcluster *pmdcl = 0x0;
+ AliPMDddldata *pmdddl = 0x0;
+ AliPMDcluster *pmdcl = 0x0;
+ AliPMDisocell *pmdiso = 0x0;
Float_t clusdata[6];
TObjArray pmdddlcont;
TObjArray *pmdcont = new TObjArray();
+ TObjArray *pmdisocell = new TObjArray();
AliPMDClustering *pmdclust = new AliPMDClusteringV1();
- pmdclust->SetEdepCut(fEcut);
+ // open the ddl file info to know the module
+ TString ddlinfofileName(gSystem->Getenv("ALICE_ROOT"));
+ ddlinfofileName += "/PMD/PMD_ddl_info.dat";
+
+ ifstream infileddl;
+ infileddl.open(ddlinfofileName.Data(), ios::in); // ascii file
+ if(!infileddl) AliError("Could not read the ddl info file");
+
+ Int_t ddlno;
+ Int_t modno;
+ Int_t modulePerDDL;
+ Int_t moduleddl[6];
+
+ for(Int_t jddl = 0; jddl < 6; jddl++)
+ {
+ if (infileddl.eof()) break;
+ infileddl >> ddlno >> modulePerDDL;
+ moduleddl[jddl] = modulePerDDL;
+
+ if (modulePerDDL == 0) continue;
+ for (Int_t im = 0; im < modulePerDDL; im++)
+ {
+ infileddl >> modno;
+ }
+ }
+
+ infileddl.close();
+
+ // Set the minimum noise cut per module before clustering
+
+ fRecoParam = AliPMDReconstructor::GetRecoParam();
+
+ if(fRecoParam == 0x0)
+ {
+ AliFatal("No Reco Param found for PMD!!!");
+ }
ResetRecpoint();
AliPMDRawStream pmdinput(rawReader);
while ((indexDDL = pmdinput.DdlData(&pmdddlcont)) >=0)
- {
- if (indexDDL < 4)
- {
- iSMN = 6;
- }
- else if (indexDDL >= 4)
- {
- iSMN = 12;
- }
+ {
+ iSMN = moduleddl[indexDDL];
+
Int_t ***precpvADC;
precpvADC = new int **[iSMN];
for (Int_t i=0; i<iSMN; i++) precpvADC[i] = new int *[kRow];
Int_t ientries = pmdddlcont.GetEntries();
for (Int_t ient = 0; ient < ientries; ient++)
{
- pmdddl = (AliPMDddldata*)pmdddlcont.UncheckedAt(ient);
+ pmdddl = (AliPMDddldata*)pmdddlcont.UncheckedAt(ient);
Int_t det = pmdddl->GetDetector();
Int_t smn = pmdddl->GetSMN();
{
AliError(Form("*Row %d and Column NUMBER %d NOT Valid *",
row, col));
+
continue;
}
// Float_t sig1 = (Float_t) sig;
Float_t sig1 = (Float_t) sig - (pedmean + 3.0*pedrms);
+ // Hot cell - set the cell adc = 0
+ Float_t hotflag = fCalibHot->GetHotChannel(det,smn,row,col);
+ if (hotflag == 1) sig1 = 0;
+
// CALIBRATION
Float_t gain = fCalibGain->GetGainFact(det,smn,row,col);
//printf("sig = %d gain = %f\n",sig,gain);
sig = (Int_t) (sig1*gain);
- if (indexDDL < 4)
+ if (indexDDL == 0)
+ {
+ if (det != 0)
+ AliError(Form("*DDL %d and Detector NUMBER %d NOT MATCHING *",
+ indexDDL, det));
+ if (iSMN == 6)
+ {
+ indexsmn = smn;
+ }
+ else if (iSMN == 12)
+ {
+ if (smn < 6)
+ indexsmn = smn;
+ else if (smn >= 18 && smn < 24)
+ indexsmn = smn-12;
+ }
+ }
+ else if (indexDDL >= 1 && indexDDL < 4)
{
if (det != 0)
AliError(Form("*DDL %d and Detector NUMBER %d NOT MATCHING *",
if (det != 1)
AliError(Form("*DDL %d and Detector NUMBER %d NOT MATCHING *",
indexDDL, det));
- if (smn >= 6 && smn < 12)
- {
- indexsmn = smn - 6;
- }
- else if (smn >= 12 && smn < 18)
+ if (smn >= 6 && smn < 18)
{
indexsmn = smn - 6;
}
}
+
precpvADC[indexsmn][row][col] = sig;
}
{
for (Int_t icol = 0; icol < kCol; icol++)
{
+ fCellTrack[irow][icol] = -1;
+ fCellPid[irow][icol] = -1;
+
fCellADC[irow][icol] =
(Double_t) precpvADC[indexsmn][irow][icol];
totAdcMod += precpvADC[indexsmn][irow][icol];
} // row
} // col
- if (indexDDL < 4)
+ if (indexDDL == 0)
+ {
+ if (iSMN == 6)
+ {
+ ismn = indexsmn;
+ }
+ else if (iSMN == 12)
+ {
+
+ if (indexsmn < 6)
+ ismn = indexsmn;
+ else if (indexsmn >= 6 && indexsmn < 12)
+ ismn = indexsmn + 12;
+ }
+ idet = 0;
+ }
+ else if (indexDDL >= 1 && indexDDL < 4)
{
ismn = indexsmn + indexDDL * 6;
idet = 0;
}
else if (indexDDL == 5)
{
- if (indexsmn < 6)
- {
- ismn = indexsmn + 6;
- }
- else if (indexsmn >= 6 && indexsmn < 12)
- {
- ismn = indexsmn + 6;
- }
+ ismn = indexsmn + 6;
idet = 1;
}
if (totAdcMod <= 0) continue;
- pmdclust->DoClust(idet,ismn,fCellADC,pmdcont);
+
+ Int_t imod = idet*24 + ismn;
+
+ fEcut = fRecoParam->GetNoiseCut(imod); // default
+ // fEcut = fRecoParam->GetPbPbParam()->GetNoiseCut(imod);
+ // fEcut = fRecoParam->GetPPParam()->GetNoiseCut(imod);
+ // fEcut = fRecoParam->GetCosmicParam()->GetNoiseCut(imod);
+
+
+ pmdclust->SetEdepCut(fEcut);
+
+ pmdclust->DoClust(idet,ismn,fCellTrack,fCellPid,fCellADC,
+ pmdisocell,pmdcont);
+
Int_t nentries1 = pmdcont->GetEntries();
AliDebug(1,Form("Total number of clusters/module = %d",nentries1));
for (Int_t ient1 = 0; ient1 < nentries1; ient1++)
{
- pmdcl = (AliPMDcluster*)pmdcont->UncheckedAt(ient1);
+ pmdcl = (AliPMDcluster*)pmdcont->UncheckedAt(ient1);
idet = pmdcl->GetDetector();
ismn = pmdcl->GetSMN();
clusdata[0] = pmdcl->GetClusX();
{
Int_t celldataX = pmdcl->GetClusCellX(ihit);
Int_t celldataY = pmdcl->GetClusCellY(ihit);
- AddRecHit(celldataX, celldataY);
+ Int_t celldataTr = pmdcl->GetClusCellTrack(ihit);
+ Int_t celldataPid = pmdcl->GetClusCellPid(ihit);
+ Float_t celldataAdc = pmdcl->GetClusCellAdc(ihit);
+ AddRecHit(celldataX, celldataY, celldataTr, celldataPid, celldataAdc);
}
branch2->Fill();
ResetRechit();
}
pmdcont->Delete();
+
+
+ // Added single isolated cell for offline gain calibration
+ nentries1 = pmdisocell->GetEntries();
+ AliDebug(1,Form("Total number of isolated single cell clusters = %d",nentries1));
+
+ for (Int_t ient1 = 0; ient1 < nentries1; ient1++)
+ {
+ pmdiso = (AliPMDisocell*)pmdisocell->UncheckedAt(ient1);
+ idet = pmdiso->GetDetector();
+ ismn = pmdiso->GetSmn();
+ clusdata[0] = (Float_t) pmdiso->GetRow();
+ clusdata[1] = (Float_t) pmdiso->GetCol();
+ clusdata[2] = pmdiso->GetADC();
+ clusdata[3] = 1.;
+ clusdata[4] = -99.;
+ clusdata[5] = -99.;
+
+ AddRecPoint(idet,ismn,clusdata);
+ }
+ pmdisocell->Delete();
branch1->Fill();
ResetRecpoint();
for (Int_t j=0; j<kRow; j++) delete [] precpvADC[i][j];
}
for (Int_t i=0; i<iSMN; i++) delete [] precpvADC[i];
- delete precpvADC;
+ delete [] precpvADC;
} // DDL Loop
+
ResetCellADC();
// delete the pointers
delete pmdclust;
delete pmdcont;
+ delete pmdisocell;
}
// ------------------------------------------------------------------------- //
//
Float_t clusdata[6];
+
TObjArray pmdddlcont;
+
+ AliPMDcluster *pmdcl = 0x0;
+ AliPMDisocell *pmdiso = 0x0;
+
+
TObjArray *pmdcont = new TObjArray();
+ TObjArray *pmdisocell = new TObjArray();
AliPMDClustering *pmdclust = new AliPMDClusteringV1();
- pmdclust->SetEdepCut(fEcut);
+ // open the ddl file info to know the module
+ TString ddlinfofileName(gSystem->Getenv("ALICE_ROOT"));
+ ddlinfofileName += "/PMD/PMD_ddl_info.dat";
+
+ ifstream infileddl;
+ infileddl.open(ddlinfofileName.Data(), ios::in); // ascii file
+ if(!infileddl) AliError("Could not read the ddl info file");
+
+ Int_t ddlno;
+ Int_t modno;
+ Int_t modulePerDDL;
+ Int_t moduleddl[6];
+
+ for(Int_t jddl = 0; jddl < 6; jddl++)
+ {
+ if (infileddl.eof()) break;
+ infileddl >> ddlno >> modulePerDDL;
+ moduleddl[jddl] = modulePerDDL;
+
+ if (modulePerDDL == 0) continue;
+ for (Int_t im = 0; im < modulePerDDL; im++)
+ {
+ infileddl >> modno;
+ }
+ }
+
+ infileddl.close();
+
+ // Set the minimum noise cut per module before clustering
+
+ fRecoParam = AliPMDReconstructor::GetRecoParam();
+
+ if(fRecoParam == 0x0)
+ {
+ AliFatal("No Reco Param found for PMD!!!");
+ }
+
fRunLoader->GetEvent(ievt);
AliPMDRawStream pmdinput(rawReader);
Int_t indexDDL = -1;
- while ((indexDDL = pmdinput.DdlData(&pmdddlcont)) >=0) {
+ while ((indexDDL = pmdinput.DdlData(&pmdddlcont)) >=0)
+ {
+
+ iSMN = moduleddl[indexDDL];
- if (indexDDL < 4)
- {
- iSMN = 6;
- }
- else if (indexDDL >= 4)
- {
- iSMN = 12;
- }
Int_t ***precpvADC;
precpvADC = new int **[iSMN];
for (Int_t i=0; i<iSMN; i++) precpvADC[i] = new int *[kRow];
Int_t pedrms1 = (Int_t) pedmeanrms%100;
Float_t pedrms = (Float_t)pedrms1/10.;
Float_t pedmean = (Float_t) (pedmeanrms - pedrms1)/1000.0;
-
//printf("%f %f\n",pedmean, pedrms);
-
- //Float_t sig1 = (Float_t) sig;
Float_t sig1 = (Float_t) sig - (pedmean + 3.0*pedrms);
+
+ // Hot cell - set the cell adc = 0
+ Float_t hotflag = fCalibHot->GetHotChannel(det,smn,row,col);
+ if (hotflag == 1) sig1 = 0;
+
// CALIBRATION
Float_t gain = fCalibGain->GetGainFact(det,smn,row,col);
//printf("sig = %d gain = %f\n",sig,gain);
sig = (Int_t) (sig1*gain);
-
- if (indexDDL < 4)
+ if (indexDDL == 0)
+ {
+ if (det != 0)
+ AliError(Form("*DDL %d and Detector NUMBER %d NOT MATCHING *",
+ indexDDL, det));
+ if (iSMN == 6)
+ {
+ indexsmn = smn;
+ }
+ else if (iSMN == 12)
+ {
+ if (smn < 6)
+ indexsmn = smn;
+ else if (smn >= 18 && smn < 24)
+ indexsmn = smn-12;
+ }
+ }
+ else if (indexDDL >= 1 && indexDDL < 4)
{
if (det != 0)
AliError(Form("*DDL %d and Detector NUMBER %d NOT MATCHING *",
if (det != 1)
AliError(Form("*DDL %d and Detector NUMBER %d NOT MATCHING *",
indexDDL, det));
- if (smn >= 6 && smn < 12)
- {
- indexsmn = smn - 6;
- }
- else if (smn >= 12 && smn < 18)
+ if (smn >= 6 && smn < 18)
{
indexsmn = smn - 6;
}
}
+
precpvADC[indexsmn][row][col] = sig;
}
{
for (Int_t icol = 0; icol < kCol; icol++)
{
+ fCellTrack[irow][icol] = -1;
+ fCellPid[irow][icol] = -1;
fCellADC[irow][icol] =
(Double_t) precpvADC[indexsmn][irow][icol];
} // row
} // col
-
- if (indexDDL < 4)
+
+ if (indexDDL == 0)
+ {
+ if (iSMN == 6)
+ {
+ ismn = indexsmn;
+ }
+ else if (iSMN == 12)
+ {
+
+ if (indexsmn < 6)
+ ismn = indexsmn;
+ else if (indexsmn >= 6 && indexsmn < 12)
+ ismn = indexsmn + 12;
+ }
+ idet = 0;
+ }
+ else if (indexDDL >= 1 && indexDDL < 4)
{
ismn = indexsmn + indexDDL * 6;
idet = 0;
}
else if (indexDDL == 5)
{
- if (indexsmn < 6)
- {
- ismn = indexsmn + 6;
- }
- else if (indexsmn >= 6 && indexsmn < 12)
- {
- ismn = indexsmn + 6;
- }
+ ismn = indexsmn + 6;
idet = 1;
}
- pmdclust->DoClust(idet,ismn,fCellADC,pmdcont);
+ Int_t imod = idet*24 + ismn;
+ fEcut = fRecoParam->GetNoiseCut(imod); // default
+ // fEcut = fRecoParam->GetPbPbParam()->GetNoiseCut(imod);
+ // fEcut = fRecoParam->GetPPParam()->GetNoiseCut(imod);
+ // fEcut = fRecoParam->GetCosmicParam()->GetNoiseCut(imod);
+
+ pmdclust->SetEdepCut(fEcut);
+
+ pmdclust->DoClust(idet,ismn,fCellTrack,fCellPid,fCellADC,
+ pmdisocell,pmdcont);
+
Int_t nentries1 = pmdcont->GetEntries();
AliDebug(1,Form("Total number of clusters/module = %d",nentries1));
for (Int_t ient1 = 0; ient1 < nentries1; ient1++)
{
- AliPMDcluster *pmdcl =
- (AliPMDcluster*)pmdcont->UncheckedAt(ient1);
+ pmdcl = (AliPMDcluster*)pmdcont->UncheckedAt(ient1);
idet = pmdcl->GetDetector();
ismn = pmdcl->GetSMN();
clusdata[0] = pmdcl->GetClusX();
{
Int_t celldataX = pmdcl->GetClusCellX(ihit);
Int_t celldataY = pmdcl->GetClusCellY(ihit);
- AddRecHit(celldataX, celldataY);
+ Int_t celldataTr = pmdcl->GetClusCellTrack(ihit);
+ Int_t celldataPid = pmdcl->GetClusCellPid(ihit);
+ Float_t celldataAdc = pmdcl->GetClusCellAdc(ihit);
+ AddRecHit(celldataX, celldataY, celldataTr, celldataPid, celldataAdc);
}
branch2->Fill();
ResetRechit();
}
pmdcont->Delete();
+
+ // Added single isolated cell for offline gain calibration
+ nentries1 = pmdisocell->GetEntries();
+ AliDebug(1,Form("Total number of isolated single cell clusters = %d",nentries1));
+
+ for (Int_t ient1 = 0; ient1 < nentries1; ient1++)
+ {
+ pmdiso = (AliPMDisocell*)pmdisocell->UncheckedAt(ient1);
+ idet = pmdiso->GetDetector();
+ ismn = pmdiso->GetSmn();
+ clusdata[0] = (Float_t) pmdiso->GetRow();
+ clusdata[1] = (Float_t) pmdiso->GetCol();
+ clusdata[2] = pmdiso->GetADC();
+ clusdata[3] = 1.;
+ clusdata[4] = -99.;
+ clusdata[5] = -99.;
+
+ AddRecPoint(idet,ismn,clusdata);
+ }
+ pmdisocell->Delete();
branch1->Fill();
ResetRecpoint();
for (Int_t i=0; i<iSMN; i++) delete [] precpvADC[i];
delete precpvADC;
} // DDL Loop
-
+
+
ResetCellADC();
fPMDLoader = fRunLoader->GetLoader("PMDLoader");
// delete the pointers
delete pmdclust;
delete pmdcont;
-
+ delete pmdisocell;
}
// ------------------------------------------------------------------------- //
void AliPMDClusterFinder::SetCellEdepCut(Float_t ecut)
delete newrecpoint;
}
// ------------------------------------------------------------------------- //
-void AliPMDClusterFinder::AddRecHit(Int_t celldataX,Int_t celldataY)
+void AliPMDClusterFinder::AddRecHit(Int_t celldataX,Int_t celldataY,
+ Int_t celldataTr, Int_t celldataPid,
+ Float_t celldataAdc)
{
// Add associated cell hits to the Reconstructed points
//
TClonesArray &lrechits = *fRechits;
AliPMDrechit *newrechit;
- newrechit = new AliPMDrechit(celldataX, celldataY);
+ newrechit = new AliPMDrechit(celldataX, celldataY, celldataTr, celldataPid, celldataAdc);
new(lrechits[fNhit++]) AliPMDrechit(newrechit);
delete newrechit;
}
{
for(Int_t icol = 0; icol < fgkCol; icol++)
{
- fCellADC[irow][icol] = 0.;
+ fCellTrack[irow][icol] = -1;
+ fCellPid[irow][icol] = -1;
+ fCellADC[irow][icol] = 0.;
}
}
}
// ------------------------------------------------------------------------- //
-
void AliPMDClusterFinder::ResetRecpoint()
{
// Clear the list of reconstructed points
fPMDLoader->UnloadRecPoints();
}
// ------------------------------------------------------------------------- //
-
AliPMDCalibData* AliPMDClusterFinder::GetCalibGain() const
{
// The run number will be centralized in AliCDBManager,
return calibdata;
}
-
// ------------------------------------------------------------------------- //
-
AliPMDPedestal* AliPMDClusterFinder::GetCalibPed() const
{
// The run number will be centralized in AliCDBManager,
return pedestal;
}
+//--------------------------------------------------------------------//
+AliPMDHotData* AliPMDClusterFinder::GetCalibHot() const
+{
+ // The run number will be centralized in AliCDBManager,
+ // you don't need to set it here!
+ AliCDBEntry *entry = AliCDBManager::Instance()->Get("PMD/Calib/Hot");
+
+ if(!entry) AliFatal("HotData object retrieval failed!");
+
+ AliPMDHotData *hot = 0;
+ if (entry) hot = (AliPMDHotData*) entry->GetObject();
+
+ if (!hot) AliFatal("No hot data from database !");
+
+ return hot;
+}
+
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff