X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PMD%2FAliPMDClusterFinder.cxx;h=18d5d27d4a6d3968aebc3ce043d2582d74b62fc2;hb=f564dd5a1c8891dcbf1537a0064343a362fc624a;hp=532938857e60973181b828f24dd26a6d15690dc5;hpb=09a064557e080939d7e3c568af49ae885c49a29e;p=u%2Fmrichter%2FAliRoot.git diff --git a/PMD/AliPMDClusterFinder.cxx b/PMD/AliPMDClusterFinder.cxx index 532938857e6..18d5d27d4a6 100644 --- a/PMD/AliPMDClusterFinder.cxx +++ b/PMD/AliPMDClusterFinder.cxx @@ -26,6 +26,7 @@ #include #include #include +#include #include "AliLog.h" #include "AliRunLoader.h" @@ -41,7 +42,15 @@ #include "AliPMDrechit.h" #include "AliPMDRawStream.h" #include "AliPMDCalibData.h" - +#include "AliPMDPedestal.h" +#include "AliPMDddldata.h" +#include "AliPMDHotData.h" +#include "AliPMDNoiseCut.h" +#include "AliPMDddlinfoData.h" +#include "AliPMDRecoParam.h" +#include "AliPMDReconstructor.h" + +#include "AliDAQ.h" #include "AliCDBManager.h" #include "AliCDBEntry.h" @@ -52,6 +61,12 @@ ClassImp(AliPMDClusterFinder) AliPMDClusterFinder::AliPMDClusterFinder(): fRunLoader(0), fPMDLoader(0), + fCalibGain(GetCalibGain()), + fCalibPed(GetCalibPed()), + fCalibHot(GetCalibHot()), + fNoiseCut(GetNoiseCut()), + fDdlinfo(GetDdlinfoData()), + fRecoParam(0x0), fTreeD(0), fTreeR(0), fDigits(new TClonesArray("AliPMDdigit", 1000)), @@ -59,17 +74,22 @@ AliPMDClusterFinder::AliPMDClusterFinder(): fRechits(new TClonesArray("AliPMDrechit", 1000)), fNpoint(0), fNhit(0), - fEcut(0.) + fDetNo(0) { // // Constructor // - fCalibData = GetCalibData(); } // ------------------------------------------------------------------------- // AliPMDClusterFinder::AliPMDClusterFinder(AliRunLoader* runLoader): fRunLoader(runLoader), fPMDLoader(runLoader->GetLoader("PMDLoader")), + fCalibGain(GetCalibGain()), + fCalibPed(GetCalibPed()), + fCalibHot(GetCalibHot()), + fNoiseCut(GetNoiseCut()), + fDdlinfo(GetDdlinfoData()), + fRecoParam(0x0), fTreeD(0), fTreeR(0), fDigits(new TClonesArray("AliPMDdigit", 1000)), @@ -77,12 +97,41 @@ AliPMDClusterFinder::AliPMDClusterFinder(AliRunLoader* runLoader): fRechits(new TClonesArray("AliPMDrechit", 1000)), fNpoint(0), fNhit(0), - fEcut(0.) + fDetNo(0) { // // Constructor // - fCalibData = GetCalibData(); +} +// ------------------------------------------------------------------------- // +AliPMDClusterFinder::AliPMDClusterFinder(const AliPMDClusterFinder & finder): + TObject(finder), + fRunLoader(0), + fPMDLoader(0), + fCalibGain(GetCalibGain()), + fCalibPed(GetCalibPed()), + fCalibHot(GetCalibHot()), + fNoiseCut(GetNoiseCut()), + fDdlinfo(GetDdlinfoData()), + fRecoParam(0x0), + fTreeD(0), + fTreeR(0), + fDigits(NULL), + fRecpoints(NULL), + fRechits(NULL), + fNpoint(0), + fNhit(0), + fDetNo(0) +{ + // copy constructor + AliError("Copy constructor not allowed"); +} +// ------------------------------------------------------------------------- // +AliPMDClusterFinder &AliPMDClusterFinder::operator=(const AliPMDClusterFinder & /*finder*/) +{ + // assignment op + AliError("Assignment Operator not allowed"); + return *this; } // ------------------------------------------------------------------------- // AliPMDClusterFinder::~AliPMDClusterFinder() @@ -90,74 +139,68 @@ AliPMDClusterFinder::~AliPMDClusterFinder() // Destructor if (fDigits) { - fDigits->Delete(); - delete fDigits; - fDigits=0; + fDigits->Clear(); } if (fRecpoints) { - fRecpoints->Delete(); - delete fRecpoints; - fRecpoints=0; + fRecpoints->Clear(); } if (fRechits) { - fRechits->Delete(); - delete fRechits; - fRechits=0; + fRechits->Clear(); } + } // ------------------------------------------------------------------------- // -void AliPMDClusterFinder::Digits2RecPoints(Int_t ievt) +void AliPMDClusterFinder::Digits2RecPoints(TTree *digitsTree, + TTree *clustersTree) { // Converts digits to recpoints after running clustering // algorithm on CPV plane and PREshower plane // - Int_t det = 0,smn = 0; - Int_t xpos,ypos; - Float_t adc; - Int_t ismn; - Int_t idet; - Float_t clusdata[6]; + // This algorithm is called during the reconstruction from digits - TObjArray *pmdcont = new TObjArray(); - AliPMDClustering *pmdclust = new AliPMDClusteringV1(); + Int_t det = 0, smn = 0; + Int_t xpos = 0, ypos = 0; + Int_t ismn = 0; + Int_t idet = 0; + Float_t adc = 0.; + Float_t clusdata[6] = {0.,0.,0.,0.,0.,0.}; - pmdclust->SetEdepCut(fEcut); + AliPMDcluster *pmdcl = 0x0; - fRunLoader->GetEvent(ievt); + TObjArray *pmdcont = new TObjArray(); + AliPMDClustering *pmdclust = new AliPMDClusteringV1(); - fTreeD = fPMDLoader->TreeD(); - if (fTreeD == 0x0) - { - AliFatal("AliPMDClusterFinder: Can not get TreeD"); + // Fetch the reco param object + fRecoParam = AliPMDReconstructor::GetRecoParam(); + if(fRecoParam == 0x0) + { + AliFatal("No Reco Param found for PMD!!!"); } + + AliPMDdigit *pmddigit; - TBranch *branch = fTreeD->GetBranch("PMDDigit"); + TBranch *branch = digitsTree->GetBranch("PMDDigit"); branch->SetAddress(&fDigits); ResetRecpoint(); - fTreeR = fPMDLoader->TreeR(); - if (fTreeR == 0x0) - { - fPMDLoader->MakeTree("R"); - fTreeR = fPMDLoader->TreeR(); - } - Int_t bufsize = 16000; - TBranch * branch1 = fTreeR->Branch("PMDRecpoint", &fRecpoints, bufsize); - TBranch * branch2 = fTreeR->Branch("PMDRechit", &fRechits, bufsize); + TBranch * branch1 = clustersTree->Branch("PMDRecpoint", &fRecpoints, bufsize); + TBranch * branch2 = clustersTree->Branch("PMDRechit", &fRechits, bufsize); - Int_t nmodules = (Int_t) fTreeD->GetEntries(); + Int_t nmodules = (Int_t) digitsTree->GetEntries(); for (Int_t imodule = 0; imodule < nmodules; imodule++) { + + Int_t totADCMod = 0; ResetCellADC(); - fTreeD->GetEntry(imodule); + digitsTree->GetEntry(imodule); Int_t nentries = fDigits->GetLast(); for (Int_t ient = 0; ient < nentries+1; ient++) { @@ -168,22 +211,71 @@ void AliPMDClusterFinder::Digits2RecPoints(Int_t ievt) xpos = pmddigit->GetRow(); ypos = pmddigit->GetColumn(); adc = pmddigit->GetADC(); + + if(det < 0 || det > 1) + { + AliError(Form("*CPV/PRE NUMBER WRONG %d *",det)); + continue; + } + if(smn == -1 || smn > 23) + { + AliError(Form("*MODULE NUMBER WRONG %d *",smn)); + continue; + } + + if(xpos < 0 || xpos > 47 || ypos < 0 || ypos > 95) + { + 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%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 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 = fCalibData->GetGainFact(det,smn,xpos,ypos); - - // printf("adc = %d gain = %f\n",adc,gain); - - adc = adc*gain; + 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; + } idet = det; ismn = smn; - pmdclust->DoClust(idet,ismn,fCellADC,pmdcont); + + if (totADCMod <= 0) continue; + + // Set the minimum noise cut per module before clustering + + // Int_t imod = idet*24 + ismn; + + + // Int_t cluspar = fRecoParam->GetPbPbParam()->GetClusteringParam(); + Int_t cluspar = fRecoParam->GetPPParam()->GetClusteringParam(); + // Int_t cluspar = fRecoParam->GetCosmicParam()->GetClusteringParam(); + + pmdclust->SetClusteringParam(cluspar); + + Float_t encut = 4.; + pmdclust->SetEdepCut(encut); + pmdclust->DoClust(idet,ismn,fCellTrack,fCellPid,fCellADC,pmdcont); Int_t nentries1 = pmdcont->GetEntries(); @@ -191,7 +283,7 @@ void AliPMDClusterFinder::Digits2RecPoints(Int_t ievt) 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(); @@ -204,30 +296,32 @@ void AliPMDClusterFinder::Digits2RecPoints(Int_t ievt) AddRecPoint(idet,ismn,clusdata); Int_t ncell = (Int_t) clusdata[3]; + if (ncell > 19) ncell = 19; for(Int_t ihit = 0; ihit < ncell; ihit++) { 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->Clear(); - + pmdcont->Delete(); + branch1->Fill(); ResetRecpoint(); } // modules + ResetCellADC(); - fPMDLoader = fRunLoader->GetLoader("PMDLoader"); - fPMDLoader->WriteRecPoints("OVERWRITE"); // delete the pointers delete pmdclust; delete pmdcont; - } // ------------------------------------------------------------------------- // @@ -237,13 +331,36 @@ void AliPMDClusterFinder::Digits2RecPoints(AliRawReader *rawReader, // Converts RAW data to recpoints after running clustering // algorithm on CPV and PREshower plane // + // This method is called at the time of reconstruction from RAW data + + + AliPMDddldata *pmdddl = 0x0; + AliPMDcluster *pmdcl = 0x0; Float_t clusdata[6]; + TObjArray pmdddlcont; TObjArray *pmdcont = new TObjArray(); + AliPMDClustering *pmdclust = new AliPMDClusteringV1(); - pmdclust->SetEdepCut(fEcut); + // access the ddlinfo database to fetch the no of modules per DDL + + Int_t moduleddl[6] = {0,0,0,0,0,0}; + + for(Int_t jddl = 0; jddl < 6; jddl++) + { + moduleddl[jddl] = fDdlinfo->GetNoOfModulePerDdl(jddl); + } + + // Set the minimum noise cut per module before clustering + + fRecoParam = AliPMDReconstructor::GetRecoParam(); + + if(fRecoParam == 0x0) + { + AliFatal("No Reco Param found for PMD!!!"); + } ResetRecpoint(); @@ -252,23 +369,19 @@ void AliPMDClusterFinder::Digits2RecPoints(AliRawReader *rawReader, TBranch * branch2 = clustersTree->Branch("PMDRechit", &fRechits, bufsize); - const Int_t kDDL = 6; const Int_t kRow = 48; const Int_t kCol = 96; Int_t idet = 0; Int_t iSMN = 0; - - for (Int_t indexDDL = 0; indexDDL < kDDL; indexDDL++) + + Int_t indexDDL = -1; + 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; iReset(); - AliPMDRawStream pmdinput(rawReader); - rawReader->Select(12, indexDDL, indexDDL); - while(pmdinput.Next()) + + Int_t indexsmn = 0; + Int_t ientries = pmdddlcont.GetEntries(); + for (Int_t ient = 0; ient < ientries; ient++) { - Int_t det = pmdinput.GetDetector(); - Int_t smn = pmdinput.GetSMN(); - //Int_t mcm = pmdinput.GetMCM(); - //Int_t chno = pmdinput.GetChannel(); - Int_t row = pmdinput.GetRow(); - Int_t col = pmdinput.GetColumn(); - Int_t sig = pmdinput.GetSignal(); + pmdddl = (AliPMDddldata*)pmdddlcont.UncheckedAt(ient); - Float_t sig1 = (Float_t) sig; + Int_t det = pmdddl->GetDetector(); + Int_t smn = pmdddl->GetSMN(); + //Int_t mcm = pmdddl->GetMCM(); + //Int_t chno = pmdddl->GetChannel(); + Int_t row = pmdddl->GetRow(); + Int_t col = pmdddl->GetColumn(); + Int_t sig = pmdddl->GetSignal(); - // CALIBRATION - Float_t gain = fCalibData->GetGainFact(det,smn,row,col); - - // printf("sig = %d gain = %f\n",sig,gain); - - sig = (Int_t) (sig1*gain); - - Int_t indexsmn = 0; - if (indexDDL < 4) + if(det < 0 || det > 1) { - if (det != 0) - AliError(Form("*DDL %d and Detector NUMBER %d NOT MATCHING *", - indexDDL, det)); - indexsmn = smn - indexDDL * 6; + AliError(Form("*CPV/PRE NUMBER WRONG %d *",det)); + continue; } - else if (indexDDL == 4) + if(smn < 0 || smn > 23) { - if (det != 1) - AliError(Form("*DDL %d and Detector NUMBER %d NOT MATCHING *", - indexDDL, det)); - if (smn < 6) - { - indexsmn = smn; - } - else if (smn >= 12 && smn < 18) - { - indexsmn = smn - 6; - } + AliError(Form("*MODULE NUMBER WRONG %d *",smn)); + continue; } - else if (indexDDL == 5) + if(row < 0 || row > 47 || col < 0 || col > 95) { - 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 >= 18 && smn < 24) - { - indexsmn = smn - 12; - } - } - precpvADC[indexsmn][row][col] = sig; - } // while loop + AliError(Form("*Row %d and Column NUMBER %d NOT Valid *", + row, col)); - Int_t ismn = 0; - for (Int_t indexsmn = 0; indexsmn < iSMN; indexsmn++) - { - ResetCellADC(); - for (Int_t irow = 0; irow < kRow; irow++) - { - for (Int_t icol = 0; icol < kCol; icol++) - { - fCellADC[irow][icol] = - (Double_t) precpvADC[indexsmn][irow][icol]; - } // row - } // col - if (indexDDL < 4) - { - ismn = indexsmn + indexDDL * 6; - idet = 0; - } - else if (indexDDL == 4) - { - if (indexsmn < 6) - { - ismn = indexsmn; - } - else if (indexsmn >= 6 && indexsmn < 12) - { - ismn = indexsmn + 6; - } - idet = 1; - } - else if (indexDDL == 5) - { - if (indexsmn < 6) - { - ismn = indexsmn + 6; - } - else if (indexsmn >= 6 && indexsmn < 12) - { - ismn = indexsmn + 12; - } - idet = 1; + continue; } + // Pedestal Subtraction + Int_t pedmeanrms = fCalibPed->GetPedMeanRms(det,smn,row,col); + Int_t pedrms1 = (Int_t) pedmeanrms%100; + Float_t pedrms = (Float_t)pedrms1/10.; + Float_t pedmean = (Float_t) (pedmeanrms - pedrms1)/1000.0; - pmdclust->DoClust(idet,ismn,fCellADC,pmdcont); - Int_t nentries1 = pmdcont->GetEntries(); + //printf("%f %f\n",pedmean, pedrms); - AliDebug(1,Form("Total number of clusters/module = %d",nentries1)); + // Float_t sig1 = (Float_t) sig; + Float_t sig1 = (Float_t) sig - (pedmean + 3.0*pedrms); - for (Int_t ient1 = 0; ient1 < nentries1; ient1++) - { - AliPMDcluster *pmdcl = - (AliPMDcluster*)pmdcont->UncheckedAt(ient1); - idet = pmdcl->GetDetector(); - ismn = pmdcl->GetSMN(); - clusdata[0] = pmdcl->GetClusX(); - clusdata[1] = pmdcl->GetClusY(); - clusdata[2] = pmdcl->GetClusADC(); - clusdata[3] = pmdcl->GetClusCells(); - clusdata[4] = pmdcl->GetClusSigmaX(); - clusdata[5] = pmdcl->GetClusSigmaY(); + // Hot cell - set the cell adc = 0 + Float_t hotflag = fCalibHot->GetHotChannel(det,smn,row,col); + if (hotflag == 1.) sig1 = 0; - AddRecPoint(idet,ismn,clusdata); + // CALIBRATION + Float_t gain = fCalibGain->GetGainFact(det,smn,row,col); + //printf("sig = %d gain = %f\n",sig,gain); + sig = (Int_t) (sig1*gain); - Int_t ncell = (Int_t) clusdata[3]; - for(Int_t ihit = 0; ihit < ncell; ihit++) + if (indexDDL == 0) + { + if (det != 0) + AliError(Form("*DDL %d and Detector NUMBER %d NOT MATCHING *", + indexDDL, det)); + if (iSMN == 6) { - Int_t celldataX = pmdcl->GetClusCellX(ihit); - Int_t celldataY = pmdcl->GetClusCellY(ihit); - AddRecHit(celldataX, celldataY); + indexsmn = smn; } - branch2->Fill(); - ResetRechit(); - - } - pmdcont->Clear(); - - branch1->Fill(); - ResetRecpoint(); - - - } // smn - - for (Int_t i=0; iSetEdepCut(fEcut); - - fRunLoader->GetEvent(ievt); - - ResetRecpoint(); - - fTreeR = fPMDLoader->TreeR(); - if (fTreeR == 0x0) - { - fPMDLoader->MakeTree("R"); - fTreeR = fPMDLoader->TreeR(); - } - Int_t bufsize = 16000; - TBranch *branch1 = fTreeR->Branch("PMDRecpoint", &fRecpoints, bufsize); - TBranch *branch2 = fTreeR->Branch("PMDRechit", &fRechits, bufsize); - - const Int_t kDDL = 6; - const Int_t kRow = 48; - const Int_t kCol = 96; - - Int_t idet = 0; - Int_t iSMN = 0; - - for (Int_t indexDDL = 0; indexDDL < kDDL; 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= 18 && smn < 24) + indexsmn = smn-12; } } - } - ResetCellADC(); - rawReader->Reset(); - AliPMDRawStream pmdinput(rawReader); - rawReader->Select(12, indexDDL, indexDDL); - while(pmdinput.Next()) - { - Int_t det = pmdinput.GetDetector(); - Int_t smn = pmdinput.GetSMN(); - //Int_t mcm = pmdinput.GetMCM(); - //Int_t chno = pmdinput.GetChannel(); - Int_t row = pmdinput.GetRow(); - Int_t col = pmdinput.GetColumn(); - Int_t sig = pmdinput.GetSignal(); - - Float_t sig1 = (Float_t) sig; - // CALIBRATION - Float_t gain = fCalibData->GetGainFact(det,smn,row,col); - - // printf("sig = %d gain = %f\n",sig,gain); - - sig = (Int_t) (sig1*gain); - - Int_t indexsmn = 0; - - if (indexDDL < 4) + else if (indexDDL >= 1 && indexDDL < 4) { if (det != 0) AliError(Form("*DDL %d and Detector NUMBER %d NOT MATCHING *", @@ -550,9 +487,9 @@ void AliPMDClusterFinder::Digits2RecPoints(Int_t ievt, AliRawReader *rawReader) { indexsmn = smn; } - else if (smn >= 12 && smn < 18) + else if (smn >= 18 && smn < 24) { - indexsmn = smn - 6; + indexsmn = smn - 12; } } else if (indexDDL == 5) @@ -560,31 +497,54 @@ void AliPMDClusterFinder::Digits2RecPoints(Int_t ievt, AliRawReader *rawReader) if (det != 1) AliError(Form("*DDL %d and Detector NUMBER %d NOT MATCHING *", indexDDL, det)); - if (smn >= 6 && smn < 12) + if (smn >= 6 && smn < 18) { indexsmn = smn - 6; } - else if (smn >= 18 && smn < 24) - { - indexsmn = smn - 12; - } } + precpvADC[indexsmn][row][col] = sig; - } // while loop + } + + pmdddlcont.Delete(); + + Int_t totAdcMod = 0; Int_t ismn = 0; - for (Int_t indexsmn = 0; indexsmn < iSMN; indexsmn++) + 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 - 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; @@ -597,33 +557,36 @@ void AliPMDClusterFinder::Digits2RecPoints(Int_t ievt, AliRawReader *rawReader) } else if (indexsmn >= 6 && indexsmn < 12) { - ismn = indexsmn + 6; + ismn = indexsmn + 12; } idet = 1; } else if (indexDDL == 5) { - if (indexsmn < 6) - { - ismn = indexsmn + 6; - } - else if (indexsmn >= 6 && indexsmn < 12) - { - ismn = indexsmn + 12; - } + ismn = indexsmn + 6; idet = 1; } + if (totAdcMod <= 0) continue; + + Int_t imod = idet*24 + ismn; + + // Int_t cluspar = fRecoParam->GetPbPbParam()->GetClusteringParam(); + Int_t cluspar = fRecoParam->GetPPParam()->GetClusteringParam(); + // Int_t cluspar = fRecoParam->GetCosmicParam()->GetClusteringParam(); + pmdclust->SetClusteringParam(cluspar); + Float_t encut = fNoiseCut->GetNoiseCut(imod); + + pmdclust->SetEdepCut(encut); + pmdclust->DoClust(idet,ismn,fCellTrack,fCellPid,fCellADC,pmdcont); - pmdclust->DoClust(idet,ismn,fCellADC,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(); @@ -636,18 +599,22 @@ void AliPMDClusterFinder::Digits2RecPoints(Int_t ievt, AliRawReader *rawReader) AddRecPoint(idet,ismn,clusdata); Int_t ncell = (Int_t) clusdata[3]; + if (ncell > 19) ncell = 19; for(Int_t ihit = 0; ihit < ncell; ihit++) { 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->Clear(); - + pmdcont->Delete(); + branch1->Fill(); ResetRecpoint(); @@ -659,23 +626,16 @@ void AliPMDClusterFinder::Digits2RecPoints(Int_t ievt, AliRawReader *rawReader) for (Int_t j=0; jGetLoader("PMDLoader"); - fPMDLoader->WriteRecPoints("OVERWRITE"); - // delete the pointers delete pmdclust; delete pmdcont; - -} -// ------------------------------------------------------------------------- // -void AliPMDClusterFinder::SetCellEdepCut(Float_t ecut) -{ - fEcut = ecut; } // ------------------------------------------------------------------------- // void AliPMDClusterFinder::AddRecPoint(Int_t idet,Int_t ismn,Float_t *clusdata) @@ -689,13 +649,15 @@ void AliPMDClusterFinder::AddRecPoint(Int_t idet,Int_t ismn,Float_t *clusdata) 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; } @@ -708,12 +670,13 @@ void AliPMDClusterFinder::ResetCellADC() { 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 @@ -758,31 +721,84 @@ void AliPMDClusterFinder::UnLoadClusters() fPMDLoader->UnloadRecPoints(); } // ------------------------------------------------------------------------- // - -AliPMDCalibData* AliPMDClusterFinder::GetCalibData() const +AliPMDCalibData* AliPMDClusterFinder::GetCalibGain() const { // The run number will be centralized in AliCDBManager, // you don't need to set it here! // Added by ZA - AliCDBEntry *entry = AliCDBManager::Instance()->Get("PMD/Calib/Data"); + AliCDBEntry *entry = AliCDBManager::Instance()->Get("PMD/Calib/Gain"); - if(!entry){ - AliWarning("Calibration object retrieval failed! Dummy calibration will be used."); - - // this just remembers the actual default storage. No problem if it is null. - AliCDBStorage *origStorage = AliCDBManager::Instance()->GetDefaultStorage(); - AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT"); - - entry = AliCDBManager::Instance()->Get("PMD/Calib/Data"); - - // now reset the original default storage to AliCDBManager... - AliCDBManager::Instance()->SetDefaultStorage(origStorage); - } + if(!entry) AliFatal("Calibration object retrieval failed! "); AliPMDCalibData *calibdata=0; if (entry) calibdata = (AliPMDCalibData*) entry->GetObject(); - if (!calibdata) AliError("No calibration data from calibration database !"); + if (!calibdata) AliFatal("No calibration data from calibration database !"); return calibdata; } +// ------------------------------------------------------------------------- // +AliPMDPedestal* AliPMDClusterFinder::GetCalibPed() const +{ + // The run number will be centralized in AliCDBManager, + // you don't need to set it here! + AliCDBEntry *entry = AliCDBManager::Instance()->Get("PMD/Calib/Ped"); + + if(!entry) AliFatal("Pedestal object retrieval failed!"); + + AliPMDPedestal *pedestal = 0; + if (entry) pedestal = (AliPMDPedestal*) entry->GetObject(); + + if (!pedestal) AliFatal("No pedestal data from pedestal database !"); + + 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; +} +//--------------------------------------------------------------------// +AliPMDNoiseCut* AliPMDClusterFinder::GetNoiseCut() const +{ + // The run number will be centralized in AliCDBManager, + // you don't need to set it here! + AliCDBEntry *entry = AliCDBManager::Instance()->Get("PMD/Calib/NoiseCut"); + + if(!entry) AliFatal("Noisecut object retrieval failed!"); + + AliPMDNoiseCut *ncut = 0; + if (entry) ncut = (AliPMDNoiseCut*) entry->GetObject(); + + if (!ncut) AliFatal("No noise cut data from database !"); + + return ncut; +} +//--------------------------------------------------------------------// +AliPMDddlinfoData* AliPMDClusterFinder::GetDdlinfoData() const +{ + // The run number will be centralized in AliCDBManager, + // you don't need to set it here! + AliCDBEntry *entry = AliCDBManager::Instance()->Get("PMD/Calib/Ddlinfo"); + + if(!entry) AliFatal("ddlinfo object retrieval failed!"); + + AliPMDddlinfoData *ddlinfo = 0; + if (entry) ddlinfo = (AliPMDddlinfoData*) entry->GetObject(); + + if (!ddlinfo) AliFatal("No ddl info data from database !"); + + return ddlinfo; +} +