#include "AliPMDcluster.h"
#include "AliPMDrecpoint1.h"
#include "AliPMDrechit.h"
+#include "AliPMDisocell.h"
#include "AliPMDRawStream.h"
#include "AliPMDCalibData.h"
#include "AliPMDPedestal.h"
{
fRechits->Clear();
}
+
}
// ------------------------------------------------------------------------- //
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);
xpos = pmddigit->GetRow();
ypos = pmddigit->GetColumn();
adc = pmddigit->GetADC();
-
+ if(xpos < 0 || xpos > 48 || ypos < 0 || ypos > 96)
+ {
+ AliError(Form("*Row %d and Column NUMBER %d NOT Valid *",
+ xpos, ypos));
+ continue;
+ }
// 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);
-
+ //pmdclust->DoClust(idet,ismn,fCellADC,pmdisocell,pmdcont);
+ 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);
+ AddRecHit(celldataX, celldataY, celldataTr, celldataPid);
+ //AddRecHit(celldataX, celldataY);
}
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;
}
// ------------------------------------------------------------------------- //
// Converts digits to recpoints after running clustering
// algorithm on CPV plane and PREshower plane
//
+ // This algorithm is called during the reconstruction from digits
Int_t det = 0,smn = 0;
Int_t xpos,ypos;
Int_t idet;
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);
for (Int_t imodule = 0; imodule < nmodules; imodule++)
{
+
+ Int_t totADCMod = 0;
ResetCellADC();
digitsTree->GetEntry(imodule);
Int_t nentries = fDigits->GetLast();
xpos = pmddigit->GetRow();
ypos = pmddigit->GetColumn();
adc = pmddigit->GetADC();
-
+ if(xpos < 0 || xpos > 48 || ypos < 0 || ypos > 96)
+ {
+ AliError(Form("*Row %d and Column NUMBER %d NOT Valid *",
+ xpos, ypos));
+ continue;
+ }
+
// Pedestal Subtraction
Int_t pedmeanrms = fCalibPed->GetPedMeanRms(det,smn,xpos,ypos);
- Int_t pedrms1 = (Int_t) pedmeanrms%1000;
+ 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);
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;
+
}
idet = det;
ismn = smn;
- pmdclust->DoClust(idet,ismn,fCellADC,pmdcont);
+
+ if (totADCMod <= 0) continue;
+
+ pmdclust->DoClust(idet,ismn,fCellTrack,fCellPid,fCellADC,
+ pmdisocell,pmdcont);
Int_t nentries1 = pmdcont->GetEntries();
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);
+ AddRecHit(celldataX, celldataY, celldataTr, celldataPid);
}
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;
}
// ------------------------------------------------------------------------- //
// Converts RAW data to recpoints after running clustering
// algorithm on CPV and PREshower plane
//
- // This method is called at the time of reconstruction
+ // This method is called at the time of reconstruction from RAW data
+
+
+ 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);
Int_t ientries = pmdddlcont.GetEntries();
for (Int_t ient = 0; ient < ientries; ient++)
{
- AliPMDddldata *pmdddl = (AliPMDddldata*)pmdddlcont.UncheckedAt(ient);
+ pmdddl = (AliPMDddldata*)pmdddlcont.UncheckedAt(ient);
Int_t det = pmdddl->GetDetector();
Int_t smn = pmdddl->GetSMN();
Int_t col = pmdddl->GetColumn();
Int_t sig = pmdddl->GetSignal();
+ if(smn == -1)
+ {
+ AliError(Form("*MODULE NUMBER WRONG %d *",smn));
+ continue;
+ }
+ if(row < 0 || row > 48 || col < 0 || col > 96)
+ {
+ AliError(Form("*Row %d and Column NUMBER %d NOT Valid *",
+ row, col));
+ continue;
+ }
+
// Pedestal Subtraction
Int_t pedmeanrms = fCalibPed->GetPedMeanRms(det,smn,row,col);
- Int_t pedrms1 = (Int_t) pedmeanrms%1000;
+ Int_t pedrms1 = (Int_t) pedmeanrms%100;
Float_t pedrms = (Float_t)pedrms1/10.;
Float_t pedmean = (Float_t) (pedmeanrms - pedrms1)/1000.0;
precpvADC[indexsmn][row][col] = sig;
}
- //pmdddlcont.Clear();
pmdddlcont.Delete();
+ Int_t totAdcMod = 0;
+
Int_t ismn = 0;
for (indexsmn = 0; indexsmn < iSMN; indexsmn++)
{
ResetCellADC();
+ totAdcMod = 0;
for (Int_t irow = 0; irow < kRow; irow++)
{
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
idet = 1;
}
- pmdclust->DoClust(idet,ismn,fCellADC,pmdcont);
+ if (totAdcMod <= 0) continue;
+
+
+ //pmdclust->DoClust(idet,ismn,fCellADC,pmdisocell,pmdcont);
+ 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);
+ AddRecHit(celldataX, celldataY, celldataTr, celldataPid);
+ //AddRecHit(celldataX, celldataY);
}
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();
Int_t row = pmdddl->GetRow();
Int_t col = pmdddl->GetColumn();
Int_t sig = pmdddl->GetSignal();
-
+ if(row < 0 || row > 48 || col < 0 || col > 96)
+ {
+ AliError(Form("*Row %d and Column NUMBER %d NOT Valid *",
+ row, col));
+ continue;
+ }
// Pedestal Subtraction
Int_t pedmeanrms = fCalibPed->GetPedMeanRms(det,smn,row,col);
- Int_t pedrms1 = (Int_t) pedmeanrms%1000;
+ Int_t pedrms1 = (Int_t) pedmeanrms%100;
Float_t pedrms = (Float_t)pedrms1/10.;
Float_t pedmean = (Float_t) (pedmeanrms - pedrms1)/1000.0;
{
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
idet = 1;
}
- pmdclust->DoClust(idet,ismn,fCellADC,pmdcont);
+ //pmdclust->DoClust(idet,ismn,fCellADC,pmdisocell,pmdcont);
+ 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);
+ AddRecHit(celldataX, celldataY, celldataTr, celldataPid);
+ //AddRecHit(celldataX, celldataY);
}
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)
{
// 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);
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,
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff