X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TRD%2FAliTRDclusterizer.cxx;h=ae875f47be38cb69ef85ac5e36817c85b802fb7f;hb=8c259c6ea4654d75e6b269a540cb44bc32dc584d;hp=474735838401c7e052dab8d4c5c68bed77985d30;hpb=8c25d0140cd8bff6f66da8503b166bc4071f032f;p=u%2Fmrichter%2FAliRoot.git diff --git a/TRD/AliTRDclusterizer.cxx b/TRD/AliTRDclusterizer.cxx index 47473583840..ae875f47be3 100644 --- a/TRD/AliTRDclusterizer.cxx +++ b/TRD/AliTRDclusterizer.cxx @@ -26,6 +26,7 @@ #include "AliRunLoader.h" #include "AliLoader.h" +#include "AliTreeLoader.h" #include "AliAlignObj.h" #include "AliTRDclusterizer.h" @@ -40,7 +41,7 @@ #include "AliTRDcalibDB.h" #include "AliTRDtransform.h" #include "AliTRDSignalIndex.h" -#include "AliTRDrawStreamBase.h" +#include "AliTRDrawStream.h" #include "AliTRDfeeParam.h" #include "AliTRDtrackletWord.h" @@ -68,6 +69,7 @@ AliTRDclusterizer::AliTRDclusterizer(const AliTRDReconstructor *const rec) ,fDigits(NULL) ,fIndexes(NULL) ,fMaxThresh(0) + ,fMaxThreshTest(0) ,fSigThresh(0) ,fMinMaxCutSigma(0) ,fMinLeftRightCutSigma(0) @@ -84,17 +86,15 @@ AliTRDclusterizer::AliTRDclusterizer(const AliTRDReconstructor *const rec) ,fClusterROC(0) ,firstClusterROC(0) ,fNoOfClusters(0) + ,fBaseline(0) + ,fRawStream(NULL) { // // AliTRDclusterizer default constructor // SetBit(kLabels, kTRUE); - - AliTRDcalibDB *trd = 0x0; - if (!(trd = AliTRDcalibDB::Instance())) { - AliFatal("Could not get calibration object"); - } + SetBit(knewDM, kFALSE); fRawVersion = AliTRDfeeParam::Instance()->GetRAWversion(); @@ -110,7 +110,9 @@ AliTRDclusterizer::AliTRDclusterizer(const AliTRDReconstructor *const rec) } //_____________________________________________________________________________ -AliTRDclusterizer::AliTRDclusterizer(const Text_t *name, const Text_t *title, const AliTRDReconstructor *const rec) +AliTRDclusterizer::AliTRDclusterizer(const Text_t *name + , const Text_t *title + , const AliTRDReconstructor *const rec) :TNamed(name,title) ,fReconstructor(rec) ,fRunLoader(NULL) @@ -125,6 +127,7 @@ AliTRDclusterizer::AliTRDclusterizer(const Text_t *name, const Text_t *title, co ,fDigits(NULL) ,fIndexes(NULL) ,fMaxThresh(0) + ,fMaxThreshTest(0) ,fSigThresh(0) ,fMinMaxCutSigma(0) ,fMinLeftRightCutSigma(0) @@ -141,17 +144,15 @@ AliTRDclusterizer::AliTRDclusterizer(const Text_t *name, const Text_t *title, co ,fClusterROC(0) ,firstClusterROC(0) ,fNoOfClusters(0) + ,fBaseline(0) + ,fRawStream(NULL) { // // AliTRDclusterizer constructor // SetBit(kLabels, kTRUE); - - AliTRDcalibDB *trd = 0x0; - if (!(trd = AliTRDcalibDB::Instance())) { - AliFatal("Could not get calibration object"); - } + SetBit(knewDM, kFALSE); fDigitsManager->CreateArrays(); @@ -177,6 +178,7 @@ AliTRDclusterizer::AliTRDclusterizer(const AliTRDclusterizer &c) ,fDigits(NULL) ,fIndexes(NULL) ,fMaxThresh(0) + ,fMaxThreshTest(0) ,fSigThresh(0) ,fMinMaxCutSigma(0) ,fMinLeftRightCutSigma(0) @@ -193,12 +195,15 @@ AliTRDclusterizer::AliTRDclusterizer(const AliTRDclusterizer &c) ,fClusterROC(0) ,firstClusterROC(0) ,fNoOfClusters(0) + ,fBaseline(0) + ,fRawStream(NULL) { // // AliTRDclusterizer copy constructor // SetBit(kLabels, kTRUE); + SetBit(knewDM, kFALSE); //FillLUT(); @@ -227,13 +232,20 @@ AliTRDclusterizer::~AliTRDclusterizer() } if (fTrackletContainer){ - delete fTrackletContainer; + delete [] fTrackletContainer[0]; + delete [] fTrackletContainer[1]; + delete [] fTrackletContainer; fTrackletContainer = NULL; } if (fTransform){ delete fTransform; - fTransform = NULL; + fTransform = NULL; + } + + if (fRawStream){ + delete fRawStream; + fRawStream = NULL; } } @@ -271,6 +283,7 @@ void AliTRDclusterizer::Copy(TObject &c) const ((AliTRDclusterizer &) c).fDigits = NULL; ((AliTRDclusterizer &) c).fIndexes = NULL; ((AliTRDclusterizer &) c).fMaxThresh = 0; + ((AliTRDclusterizer &) c).fMaxThreshTest = 0; ((AliTRDclusterizer &) c).fSigThresh = 0; ((AliTRDclusterizer &) c).fMinMaxCutSigma= 0; ((AliTRDclusterizer &) c).fMinLeftRightCutSigma = 0; @@ -287,6 +300,9 @@ void AliTRDclusterizer::Copy(TObject &c) const ((AliTRDclusterizer &) c).fClusterROC = 0; ((AliTRDclusterizer &) c).firstClusterROC= 0; ((AliTRDclusterizer &) c).fNoOfClusters = 0; + ((AliTRDclusterizer &) c).fBaseline = 0; + ((AliTRDclusterizer &) c).fRawStream = NULL; + } //_____________________________________________________________________________ @@ -352,46 +368,6 @@ Bool_t AliTRDclusterizer::OpenOutput(TTree *const clusterTree) return kTRUE; } -//_____________________________________________________________________________ -Bool_t AliTRDclusterizer::OpenTrackletOutput() -{ - // - // Tracklet writing - // - - if (fReconstructor->IsWritingTracklets()){ - TString evfoldname = AliConfig::GetDefaultEventFolderName(); - fRunLoader = AliRunLoader::GetRunLoader(evfoldname); - - if (!fRunLoader) { - fRunLoader = AliRunLoader::Open("galice.root"); - } - if (!fRunLoader) { - AliError(Form("Can not open session for file galice.root.")); - return kFALSE; - } - - UInt_t **leaves = new UInt_t *[2]; - AliDataLoader *dl = fRunLoader->GetLoader("TRDLoader")->GetDataLoader("tracklets"); - if (!dl) { - AliError("Could not get the tracklets data loader!"); - dl = new AliDataLoader("TRD.Tracklets.root","tracklets", "tracklets"); - fRunLoader->GetLoader("TRDLoader")->AddDataLoader(dl); - } - fTrackletTree = dl->Tree(); - if (!fTrackletTree) - { - dl->MakeTree(); - fTrackletTree = dl->Tree(); - } - TBranch *trkbranch = fTrackletTree->GetBranch("trkbranch"); - if (!trkbranch) - fTrackletTree->Branch("trkbranch",leaves[0],"det/i:side/i:tracklets[256]/i"); - } - - return kTRUE; -} - //_____________________________________________________________________________ Bool_t AliTRDclusterizer::OpenInput(Int_t nEvent) { @@ -423,7 +399,7 @@ Bool_t AliTRDclusterizer::WriteClusters(Int_t det) TObjArray *ioArray = new TObjArray(400); TBranch *branch = fClusterTree->GetBranch("TRDcluster"); if (!branch) { - branch = fClusterTree->Branch("TRDcluster","TObjArray",&ioArray,32000,0); + fClusterTree->Branch("TRDcluster","TObjArray",&ioArray,32000,0); } else branch->SetAddress(&ioArray); Int_t nRecPoints = RecPoints()->GetEntriesFast(); @@ -434,23 +410,29 @@ Bool_t AliTRDclusterizer::WriteClusters(Int_t det) ioArray->AddLast(c); } fClusterTree->Fill(); + ioArray->Clear(); } else { - - Int_t detOld = -1; + Int_t detOld = -1, nw(0); for (Int_t i = 0; i < nRecPoints; i++) { AliTRDcluster *c = (AliTRDcluster *) RecPoints()->UncheckedAt(i); if(c->GetDetector() != detOld){ + nw += ioArray->GetEntriesFast(); fClusterTree->Fill(); ioArray->Clear(); detOld = c->GetDetector(); } ioArray->AddLast(c); } + if(ioArray->GetEntriesFast()){ + nw += ioArray->GetEntriesFast(); + fClusterTree->Fill(); + ioArray->Clear(); + } + AliDebug(2, Form("Clusters FOUND[%d] WRITTEN[%d] STATUS[%s]", nRecPoints, nw, nw==nRecPoints?"OK":"FAILED")); } delete ioArray; return kTRUE; - } //_____________________________________________________________________________ @@ -486,8 +468,8 @@ Bool_t AliTRDclusterizer::WriteTracklets(Int_t det) } } - AliDataLoader *dl = fRunLoader->GetLoader("TRDLoader")->GetDataLoader("tracklets"); - dl->WriteData("OVERWRITE"); +// AliDataLoader *dl = fRunLoader->GetLoader("TRDLoader")->GetDataLoader("tracklets"); //jkl: wrong here +// dl->WriteData("OVERWRITE"); //jkl: wrong here //dl->Unload(); delete [] leaves; @@ -586,10 +568,8 @@ Bool_t AliTRDclusterizer::MakeClusters() // ResetRecPoints(); //} - // No compress just remove - fDigitsManager->RemoveDigits(i); - fDigitsManager->RemoveDictionaries(i); - fDigitsManager->ClearIndexes(i); + // Clear arrays of this chamber, to prepare for next event + fDigitsManager->ClearArrays(i); } if(fReconstructor->IsWritingClusters()) WriteClusters(-1); @@ -620,12 +600,30 @@ Bool_t AliTRDclusterizer::Raw2ClustersChamber(AliRawReader *rawReader) // Create the digits manager if (!fDigitsManager){ + SetBit(knewDM, kTRUE); fDigitsManager = new AliTRDdigitsManager(kTRUE); fDigitsManager->CreateArrays(); } fDigitsManager->SetUseDictionaries(TestBit(kLabels)); + // ----- preparing tracklet output ----- + if (fReconstructor->IsWritingTracklets()) { + AliDataLoader *trklLoader = AliRunLoader::Instance()->GetLoader("TRDLoader")->GetDataLoader("tracklets"); + if (!trklLoader) { + //AliInfo("Could not get the tracklets data loader, adding it now!"); + trklLoader = new AliDataLoader("TRD.Tracklets.root","tracklets", "tracklets"); + AliRunLoader::Instance()->GetLoader("TRDLoader")->AddDataLoader(trklLoader); + } + AliTreeLoader *trklTreeLoader = dynamic_cast (trklLoader->GetBaseLoader("tracklets-raw")); + if (!trklTreeLoader) { + trklTreeLoader = new AliTreeLoader("tracklets-raw", trklLoader); + trklLoader->AddBaseLoader(trklTreeLoader); + } + if (!trklTreeLoader->Tree()) + trklTreeLoader->MakeTree(); + } + // tracklet container for raw tracklet writing if (!fTrackletContainer && ( fReconstructor->IsWritingTracklets() || fReconstructor->IsProcessingTracklets() )) { // maximum tracklets for one HC @@ -633,27 +631,42 @@ Bool_t AliTRDclusterizer::Raw2ClustersChamber(AliRawReader *rawReader) fTrackletContainer = new UInt_t *[2]; fTrackletContainer[0] = new UInt_t[kTrackletChmb]; fTrackletContainer[1] = new UInt_t[kTrackletChmb]; + memset(fTrackletContainer[0], 0, kTrackletChmb*sizeof(UInt_t)); //jkl + memset(fTrackletContainer[1], 0, kTrackletChmb*sizeof(UInt_t)); //jkl } - AliTRDrawStreamBase *input = AliTRDrawStreamBase::GetRawStream(rawReader); - if(fReconstructor->IsHLT()) - input->SetSharedPadReadout(kFALSE); + if(!fRawStream) + fRawStream = new AliTRDrawStream(rawReader); + else + fRawStream->SetReader(rawReader); - AliInfo(Form("Stream version: %s", input->IsA()->GetName())); + if(fReconstructor->IsHLT()){ + ((AliTRDrawStream*)fRawStream)->DisableErrorStorage(); + } + + AliDebug(1,Form("Stream version: %s", fRawStream->IsA()->GetName())); - Int_t det = 0; - while ((det = input->NextChamber(fDigitsManager,fTrackletContainer)) >= 0){ - Bool_t iclusterBranch = kFALSE; + UInt_t det = 0; + while ((det = fRawStream->NextChamber(fDigitsManager,fTrackletContainer)) < AliTRDgeometry::kNdet){ if (fDigitsManager->GetIndexes(det)->HasEntry()){ - iclusterBranch = MakeClusters(det); + MakeClusters(det); + fDigitsManager->ClearArrays(det); } - - fDigitsManager->ResetArrays(det); if (!fReconstructor->IsWritingTracklets()) continue; if (*(fTrackletContainer[0]) > 0 || *(fTrackletContainer[1]) > 0) WriteTracklets(det); } + if (fReconstructor->IsWritingTracklets()) { + if (AliDataLoader *trklLoader = AliRunLoader::Instance()->GetLoader("TRDLoader")->GetDataLoader("tracklets")) { + if (trklLoader) { + if (AliTreeLoader *trklTreeLoader = (AliTreeLoader*) trklLoader->GetBaseLoader("tracklets-raw")) + trklTreeLoader->WriteData("OVERWRITE"); + trklLoader->UnloadAll(); + } + } + } + if (fTrackletContainer){ delete [] fTrackletContainer[0]; delete [] fTrackletContainer[1]; @@ -663,11 +676,12 @@ Bool_t AliTRDclusterizer::Raw2ClustersChamber(AliRawReader *rawReader) if(fReconstructor->IsWritingClusters()) WriteClusters(-1); - delete fDigitsManager; - fDigitsManager = NULL; - - delete input; - input = NULL; + if(!TestBit(knewDM)){ + delete fDigitsManager; + fDigitsManager = NULL; + delete fRawStream; + fRawStream = NULL; + } AliInfo(Form("Number of found clusters : %d", fNoOfClusters)); return kTRUE; @@ -728,7 +742,8 @@ Bool_t AliTRDclusterizer::MakeClusters(Int_t det) // // Get the digits - fDigits = (AliTRDarrayADC *) fDigitsManager->GetDigits(det); //mod + fDigits = (AliTRDarrayADC *) fDigitsManager->GetDigits(det); //mod + fBaseline = fDigitsManager->GetDigitsParam()->GetADCbaseline(det); // This is to take care of switched off super modules if (!fDigits->HasData()) return kFALSE; @@ -739,7 +754,7 @@ Bool_t AliTRDclusterizer::MakeClusters(Int_t det) return kFALSE; } - AliTRDcalibDB *calibration = AliTRDcalibDB::Instance(); + AliTRDcalibDB* const calibration = AliTRDcalibDB::Instance(); if (!calibration) { AliFatal("No AliTRDcalibDB instance available\n"); return kFALSE; @@ -750,10 +765,14 @@ Bool_t AliTRDclusterizer::MakeClusters(Int_t det) return kFALSE; } - fMaxThresh = fReconstructor->GetRecoParam()->GetClusMaxThresh(); - fSigThresh = fReconstructor->GetRecoParam()->GetClusSigThresh(); - fMinMaxCutSigma = fReconstructor->GetRecoParam()->GetMinMaxCutSigma(); - fMinLeftRightCutSigma = fReconstructor->GetRecoParam()->GetMinLeftRightCutSigma(); + const AliTRDrecoParam *const recoParam = fReconstructor->GetRecoParam(); + + fMaxThresh = (Short_t)recoParam->GetClusMaxThresh(); + fMaxThreshTest = (Short_t)(recoParam->GetClusMaxThresh()/2+fBaseline); + fSigThresh = (Short_t)recoParam->GetClusSigThresh(); + fMinMaxCutSigma = recoParam->GetMinMaxCutSigma(); + fMinLeftRightCutSigma = recoParam->GetMinLeftRightCutSigma(); + const Int_t iEveryNTB = recoParam->GetRecEveryNTB(); Int_t istack = fIndexes->GetStack(); fLayer = fIndexes->GetLayer(); @@ -767,6 +786,8 @@ Bool_t AliTRDclusterizer::MakeClusters(Int_t det) return kFALSE; } + AliDebug(2, Form("Det[%d] @ Sec[%d] Stk[%d] Ly[%d]", fDet, isector, istack, fLayer)); + // TRD space point transformation fTransform->SetDetector(det); @@ -778,8 +799,31 @@ Bool_t AliTRDclusterizer::MakeClusters(Int_t det) AddTrackletsToArray(); fColMax = fDigits->GetNcol(); - //Int_t nRowMax = fDigits->GetNrow(); - fTimeTotal = fDigits->GetNtime(); + fTimeTotal = fDigitsManager->GetDigitsParam()->GetNTimeBins(det); + + // Check consistency between OCDB and raw data + Int_t nTimeOCDB = calibration->GetNumberOfTimeBinsDCS(); + if(fReconstructor->IsHLT()){ + if((nTimeOCDB > -1) && (fTimeTotal != nTimeOCDB)){ + AliWarning(Form("Number of timebins does not match OCDB value (RAW[%d] OCDB[%d]), using raw value" + ,fTimeTotal,nTimeOCDB)); + } + }else{ + if(nTimeOCDB == -1){ + AliWarning("Undefined number of timebins in OCDB, using value from raw data."); + if(!fTimeTotal>0){ + AliError("Number of timebins in raw data is negative, skipping chamber!"); + return kFALSE; + } + }else if(nTimeOCDB == -2){ + AliError("Mixed number of timebins in OCDB, no reconstruction of TRD data!"); + return kFALSE; + }else if(fTimeTotal != nTimeOCDB){ + AliError(Form("Number of timebins in raw data does not match OCDB value (RAW[%d] OCDB[%d]), skipping chamber!" + ,fTimeTotal,nTimeOCDB)); + return kFALSE; + } + } // Detector wise calibration object for the gain factors const AliTRDCalDet *calGainFactorDet = calibration->GetGainFactorDet(); @@ -798,38 +842,36 @@ Bool_t AliTRDclusterizer::MakeClusters(Int_t det) // Calibration object with the pad status fCalPadStatusROC = calibration->GetPadStatusROC(fDet); - SetBit(kLUT, fReconstructor->GetRecoParam()->UseLUT()); - SetBit(kGAUS, fReconstructor->GetRecoParam()->UseGAUS()); - SetBit(kHLT, fReconstructor->IsHLT()); - firstClusterROC = -1; fClusterROC = 0; + SetBit(kLUT, recoParam->UseLUT()); + SetBit(kGAUS, recoParam->UseGAUS()); + // Apply the gain and the tail cancelation via digital filter - if(fReconstructor->GetRecoParam()->UseTailCancelation()) TailCancelation(); + // Use the configuration from the DCS to find out whether online + // tail cancellation was applied + if(!calibration->HasOnlineTailCancellation()) TailCancelation(recoParam); MaxStruct curr, last; Int_t nMaximas = 0, nCorrupted = 0; // Here the clusterfining is happening - for(curr.Time = 0; curr.Time < fTimeTotal; curr.Time++){ - while(fIndexes->NextRCIndex(curr.Row, curr.Col)){ - //printf("\nCHECK r[%2d] c[%3d] t[%d]\n", curr.Row, curr.Col, curr.Time); - if(IsMaximum(curr, curr.padStatus, &curr.Signals[0])){ - //printf("\tMAX s[%d %d %d]\n", curr.Signals[0], curr.Signals[1], curr.Signals[2]); - if(last.Row>-1){ - if(curr.Time==last.Time && curr.Row==last.Row && curr.Col==last.Col+2) FivePadCluster(last, curr); + for(curr.time = 0; curr.time < fTimeTotal; curr.time+=iEveryNTB){ + while(fIndexes->NextRCIndex(curr.row, curr.col)){ + if(fDigits->GetData(curr.row, curr.col, curr.time) > fMaxThreshTest && IsMaximum(curr, curr.padStatus, &curr.signals[0])){ + if(last.row>-1){ + if(curr.col==last.col+2 && curr.row==last.row && curr.time==last.time) FivePadCluster(last, curr); CreateCluster(last); } - last=curr; curr.FivePad=kFALSE; + last=curr; curr.fivePad=kFALSE; } - //printf("\t--- s[%d %d %d]\n", curr.Signals[0], curr.Signals[1], curr.Signals[2]); } } - if(last.Row>-1) CreateCluster(last); + if(last.row>-1) CreateCluster(last); - if(fReconstructor->GetRecoParam()->GetStreamLevel(AliTRDrecoParam::kClusterizer) > 2 && fReconstructor->IsDebugStreaming()){ + if(recoParam->GetStreamLevel(AliTRDrecoParam::kClusterizer) > 2 && fReconstructor->IsDebugStreaming()){ TTreeSRedirector* fDebugStream = fReconstructor->GetDebugStream(AliTRDrecoParam::kClusterizer); (*fDebugStream) << "MakeClusters" << "Detector=" << det @@ -852,47 +894,62 @@ Bool_t AliTRDclusterizer::IsMaximum(const MaxStruct &Max, UChar_t &padStatus, Sh // Gives back the padStatus and the signals of the center pad and the two neighbouring pads. // - Signals[1] = fDigits->GetData(Max.Row, Max.Col, Max.Time); - if(Signals[1] < fMaxThresh) return kFALSE; + Float_t tmp(0.), kMaxShortVal(32767.); // protect against data overflow due to wrong gain calibration + Float_t gain = fCalGainFactorDetValue * fCalGainFactorROC->GetValue(Max.col,Max.row); + tmp = (fDigits->GetData(Max.row, Max.col, Max.time) - fBaseline) / gain + 0.5f; + Signals[1] = (Short_t)TMath::Min(tmp, kMaxShortVal); + if(Signals[1] <= fMaxThresh) return kFALSE; - Float_t noiseMiddleThresh = fMinMaxCutSigma*fCalNoiseDetValue*fCalNoiseROC->GetValue(Max.Col, Max.Row); - if (Signals[1] < noiseMiddleThresh) return kFALSE; + if(Max.col < 1 || Max.col + 1 >= fColMax) return kFALSE; - if (Max.Col + 1 >= fColMax || Max.Col < 1) return kFALSE; + Short_t noiseMiddleThresh = (Short_t)(fMinMaxCutSigma*fCalNoiseDetValue*fCalNoiseROC->GetValue(Max.col, Max.row)); + if (Signals[1] <= noiseMiddleThresh) return kFALSE; UChar_t status[3]={ - fCalPadStatusROC->GetStatus(Max.Col-1, Max.Row) - ,fCalPadStatusROC->GetStatus(Max.Col, Max.Row) - ,fCalPadStatusROC->GetStatus(Max.Col+1, Max.Row) + fCalPadStatusROC->GetStatus(Max.col-1, Max.row) + ,fCalPadStatusROC->GetStatus(Max.col, Max.row) + ,fCalPadStatusROC->GetStatus(Max.col+1, Max.row) }; - Signals[0] = fDigits->GetData(Max.Row, Max.Col-1, Max.Time); - Signals[2] = fDigits->GetData(Max.Row, Max.Col+1, Max.Time); + Short_t signal(0); + if((signal = fDigits->GetData(Max.row, Max.col-1, Max.time))){ + gain = fCalGainFactorDetValue * fCalGainFactorROC->GetValue(Max.col-1,Max.row); + tmp = (signal - fBaseline) / gain + 0.5f; + Signals[0] = (Short_t)TMath::Min(tmp, kMaxShortVal); + } else Signals[0] = 0; + if((signal = fDigits->GetData(Max.row, Max.col+1, Max.time))){ + gain = fCalGainFactorDetValue * fCalGainFactorROC->GetValue(Max.col+1,Max.row); + tmp = (signal - fBaseline) / gain + 0.5f; + Signals[2] = (Short_t)TMath::Min(tmp, kMaxShortVal); + } else Signals[2] = 0; if(!(status[0] | status[1] | status[2])) {//all pads are good if ((Signals[2] <= Signals[1]) && (Signals[0] < Signals[1])) { - if ((Signals[2] >= fSigThresh) || (Signals[0] >= fSigThresh)) { - Float_t noiseSumThresh = fMinLeftRightCutSigma - * fCalNoiseDetValue - * fCalNoiseROC->GetValue(Max.Col, Max.Row); - if ((Signals[2]+Signals[0]+Signals[1]) < noiseSumThresh) return kFALSE; + if ((Signals[2] > fSigThresh) || (Signals[0] > fSigThresh)) { + if(Signals[0]<0)Signals[0]=0; + if(Signals[2]<0)Signals[2]=0; + Short_t noiseSumThresh = (Short_t)(fMinLeftRightCutSigma * fCalNoiseDetValue + * fCalNoiseROC->GetValue(Max.col, Max.row)); + if ((Signals[2]+Signals[0]+Signals[1]) <= noiseSumThresh) return kFALSE; padStatus = 0; return kTRUE; } } } else { // at least one of the pads is bad, and reject candidates with more than 1 problematic pad - if (status[2] && (!(status[0] || status[1])) && Signals[1] > Signals[0] && Signals[0] >= fSigThresh) { + if(Signals[0]<0)Signals[0]=0; + if(Signals[2]<0)Signals[2]=0; + if (status[2] && (!(status[0] || status[1])) && Signals[1] > Signals[0] && Signals[0] > fSigThresh) { Signals[2]=0; SetPadStatus(status[2], padStatus); return kTRUE; } - else if (status[0] && (!(status[1] || status[2])) && Signals[1] >= Signals[2] && Signals[2] >= fSigThresh) { + else if (status[0] && (!(status[1] || status[2])) && Signals[1] >= Signals[2] && Signals[2] > fSigThresh) { Signals[0]=0; SetPadStatus(status[0], padStatus); return kTRUE; } - else if (status[1] && (!(status[0] || status[2])) && ((Signals[2] >= fSigThresh) || (Signals[0] >= fSigThresh))) { - Signals[1]=TMath::Nint(fMaxThresh); + else if (status[1] && (!(status[0] || status[2])) && ((Signals[2] > fSigThresh) || (Signals[0] > fSigThresh))) { + Signals[1] = fMaxThresh; SetPadStatus(status[1], padStatus); return kTRUE; } @@ -907,27 +964,31 @@ Bool_t AliTRDclusterizer::FivePadCluster(MaxStruct &ThisMax, MaxStruct &Neighbou // Look for 5 pad cluster with minimum in the middle // Gives back the ratio // - if (ThisMax.Col >= fColMax - 3) return kFALSE; - if (ThisMax.Col < fColMax - 5){ - if (fDigits->GetData(ThisMax.Row, ThisMax.Col+4, ThisMax.Time) >= fSigThresh) + + if (ThisMax.col >= fColMax - 3) return kFALSE; + Float_t gain; + if (ThisMax.col < fColMax - 5){ + gain = fCalGainFactorDetValue * fCalGainFactorROC->GetValue(ThisMax.col+4,ThisMax.row); + if (fDigits->GetData(ThisMax.row, ThisMax.col+4, ThisMax.time) - fBaseline >= fSigThresh * gain) return kFALSE; } - if (ThisMax.Col > 1) { - if (fDigits->GetData(ThisMax.Row, ThisMax.Col-2, ThisMax.Time) >= fSigThresh) + if (ThisMax.col > 1) { + gain = fCalGainFactorDetValue * fCalGainFactorROC->GetValue(ThisMax.col-2,ThisMax.row); + if (fDigits->GetData(ThisMax.row, ThisMax.col-2, ThisMax.time) - fBaseline >= fSigThresh * gain) return kFALSE; } const Float_t kEpsilon = 0.01; - Double_t padSignal[5] = {ThisMax.Signals[0], ThisMax.Signals[1], ThisMax.Signals[2], - NeighbourMax.Signals[1], NeighbourMax.Signals[2]}; + Double_t padSignal[5] = {ThisMax.signals[0], ThisMax.signals[1], ThisMax.signals[2], + NeighbourMax.signals[1], NeighbourMax.signals[2]}; // Unfold the two maxima and set the signal on // the overlapping pad to the ratio Float_t ratio = Unfold(kEpsilon,fLayer,padSignal); - ThisMax.Signals[2] = TMath::Nint(ThisMax.Signals[2]*ratio); - NeighbourMax.Signals[0] = TMath::Nint(NeighbourMax.Signals[0]*(1-ratio)); - ThisMax.FivePad=kTRUE; - NeighbourMax.FivePad=kTRUE; + ThisMax.signals[2] = (Short_t)(ThisMax.signals[2]*ratio + 0.5f); + NeighbourMax.signals[0] = (Short_t)(NeighbourMax.signals[0]*(1-ratio) + 0.5f); + ThisMax.fivePad=kTRUE; + NeighbourMax.fivePad=kTRUE; return kTRUE; } @@ -940,35 +1001,37 @@ void AliTRDclusterizer::CreateCluster(const MaxStruct &Max) // Int_t nPadCount = 1; - Short_t signals[7] = { 0, 0, Max.Signals[0], Max.Signals[1], Max.Signals[2], 0, 0 }; - if(!TestBit(kHLT)) CalcAdditionalInfo(Max, signals, nPadCount); + Short_t signals[7] = { 0, 0, Max.signals[0], Max.signals[1], Max.signals[2], 0, 0 }; + if(!fReconstructor->IsHLT()) CalcAdditionalInfo(Max, signals, nPadCount); - AliTRDcluster cluster(fDet, ((UChar_t) Max.Col), ((UChar_t) Max.Row), ((UChar_t) Max.Time), signals, fVolid); + AliTRDcluster cluster(fDet, ((UChar_t) Max.col), ((UChar_t) Max.row), ((UChar_t) Max.time), signals, fVolid); cluster.SetNPads(nPadCount); if(TestBit(kLUT)) cluster.SetRPhiMethod(AliTRDcluster::kLUT); else if(TestBit(kGAUS)) cluster.SetRPhiMethod(AliTRDcluster::kGAUS); else cluster.SetRPhiMethod(AliTRDcluster::kCOG); - cluster.SetFivePad(Max.FivePad); + cluster.SetFivePad(Max.fivePad); // set pads status for the cluster UChar_t maskPosition = GetCorruption(Max.padStatus); if (maskPosition) { cluster.SetPadMaskedPosition(maskPosition); cluster.SetPadMaskedStatus(GetPadStatus(Max.padStatus)); } + cluster.SetXcorr(fReconstructor->UseClusterRadialCorrection()); // Transform the local cluster coordinates into calibrated // space point positions defined in the local tracking system. // Here the calibration for T0, Vdrift and ExB is applied as well. - if(!fTransform->Transform(&cluster)) return; + if(!TestBit(kSkipTrafo)) if(!fTransform->Transform(&cluster)) return; + // Temporarily store the Max.Row, column and time bin of the center pad // Used to later on assign the track indices - cluster.SetLabel(Max.Row, 0); - cluster.SetLabel(Max.Col, 1); - cluster.SetLabel(Max.Time,2); + cluster.SetLabel(Max.row, 0); + cluster.SetLabel(Max.col, 1); + cluster.SetLabel(Max.time,2); //needed for HLT reconstruction - AddClusterToArray(&cluster); + AddClusterToArray(&cluster); // Store the index of the first cluster in the current ROC if (firstClusterROC < 0) firstClusterROC = fNoOfClusters; @@ -980,37 +1043,41 @@ void AliTRDclusterizer::CreateCluster(const MaxStruct &Max) //_____________________________________________________________________________ void AliTRDclusterizer::CalcAdditionalInfo(const MaxStruct &Max, Short_t *const signals, Int_t &nPadCount) { +// Calculate number of pads/cluster and +// ADC signals at position 0, 1, 5 and 6 + + Float_t tmp(0.), kMaxShortVal(32767.); // protect against data overflow due to wrong gain calibration + Float_t gain(1.); Short_t signal(0); + // Store the amplitudes of the pads in the cluster for later analysis + // and check whether one of these pads is masked in the database + signals[3]=Max.signals[1]; + Int_t ipad(1), jpad(0); // Look to the right - Int_t ii = 1; - while (fDigits->GetData(Max.Row, Max.Col-ii, Max.Time) >= fSigThresh) { + while((jpad = Max.col-ipad)){ + if(!(signal = fDigits->GetData(Max.row, jpad, Max.time))) break; // empty digit ! + gain = fCalGainFactorDetValue * fCalGainFactorROC->GetValue(jpad, Max.row); + tmp = (signal - fBaseline) / gain + 0.5f; + signal = (Short_t)TMath::Min(tmp, kMaxShortVal); + if(signalGetData(Max.Row, Max.Col+ii, Max.Time) >= fSigThresh) { + while((jpad = Max.col+ipad)GetData(Max.row, jpad, Max.time))) break; // empty digit ! + gain = fCalGainFactorDetValue * fCalGainFactorROC->GetValue(jpad, Max.row); + tmp = (signal - fBaseline) / gain + 0.5f; + signal = (Short_t)TMath::Min(tmp, kMaxShortVal); + if(signal= fColMax) break; + if(ipad<=3) signals[3 + ipad] = signal; + ipad++; } - // Store the amplitudes of the pads in the cluster for later analysis - // and check whether one of these pads is masked in the database - signals[2]=Max.Signals[0]; - signals[3]=Max.Signals[1]; - signals[4]=Max.Signals[2]; - for(Int_t i = 0; i<2; i++) - { - if(Max.Col+i >= 3) - signals[i] = fDigits->GetData(Max.Row, Max.Col-3+i, Max.Time); - if(Max.Col+3-i < fColMax) - signals[6-i] = fDigits->GetData(Max.Row, Max.Col+3-i, Max.Time); - } - /*for (Int_t jPad = Max.Col-3; jPad <= Max.Col+3; jPad++) { - if ((jPad >= 0) && (jPad < fColMax)) - signals[jPad-Max.Col+3] = TMath::Nint(fDigits->GetData(Max.Row,jPad,Max.Time)); - }*/ + AliDebug(4, Form("Signals[%3d %3d %3d %3d %3d %3d %3d] Npads[%d]." + , signals[0], signals[1], signals[2], signals[3], signals[4], signals[5], signals[6], nPadCount)); } //_____________________________________________________________________________ @@ -1173,89 +1240,58 @@ Float_t AliTRDclusterizer::Unfold(Double_t eps, Int_t layer, const Double_t *con } //_____________________________________________________________________________ -void AliTRDclusterizer::TailCancelation() +void AliTRDclusterizer::TailCancelation(const AliTRDrecoParam* const recoParam) { // - // Applies the tail cancelation and gain factors: - // Transform fDigits to fDigits + // Applies the tail cancelation // + Int_t nexp = recoParam->GetTCnexp(); + if(!nexp) return; + Int_t iRow = 0; Int_t iCol = 0; Int_t iTime = 0; - Double_t *inADC = new Double_t[fTimeTotal]; // ADC data before tail cancellation - Double_t *outADC = new Double_t[fTimeTotal]; // ADC data after tail cancellation - - fIndexes->ResetCounters(); TTreeSRedirector *fDebugStream = fReconstructor->GetDebugStream(AliTRDrecoParam::kClusterizer); + Bool_t debugStreaming = recoParam->GetStreamLevel(AliTRDrecoParam::kClusterizer) > 7 && fReconstructor->IsDebugStreaming(); while(fIndexes->NextRCIndex(iRow, iCol)) { - Float_t fCalGainFactorROCValue = fCalGainFactorROC->GetValue(iCol,iRow); - Double_t gain = fCalGainFactorDetValue - * fCalGainFactorROCValue; - - Bool_t corrupted = kFALSE; - for (iTime = 0; iTime < fTimeTotal; iTime++) - { - // Apply gain gain factor - inADC[iTime] = fDigits->GetData(iRow,iCol,iTime); - if (fCalPadStatusROC->GetStatus(iCol, iRow)) corrupted = kTRUE; - inADC[iTime] /= gain; - outADC[iTime] = inADC[iTime]; - if(fReconstructor->GetRecoParam()->GetStreamLevel(AliTRDrecoParam::kClusterizer) > 7 && fReconstructor->IsDebugStreaming()){ - (*fDebugStream) << "TailCancellation" - << "col=" << iCol - << "row=" << iRow - << "time=" << iTime - << "inADC=" << inADC[iTime] - << "gain=" << gain - << "outADC=" << outADC[iTime] - << "corrupted=" << corrupted - << "\n"; - } - } - if (!corrupted) - { - // Apply the tail cancelation via the digital filter - // (only for non-coorupted pads) - DeConvExp(&inADC[0],&outADC[0],fTimeTotal,fReconstructor->GetRecoParam() ->GetTCnexp()); - } - - for(iTime = 0; iTime < fTimeTotal; iTime++)//while (fIndexes->NextTbinIndex(iTime)) - { - // Store the amplitude of the digit if above threshold - if (outADC[iTime] > 0) - fDigits->SetData(iRow,iCol,iTime,TMath::Nint(outADC[iTime])); - else - fDigits->SetData(iRow,iCol,iTime,0); - } // while itime - + // if corrupted then don't make the tail cancallation + if (fCalPadStatusROC->GetStatus(iCol, iRow)) continue; + + if(debugStreaming){ + for (iTime = 0; iTime < fTimeTotal; iTime++) + (*fDebugStream) << "TailCancellation" + << "col=" << iCol + << "row=" << iRow + << "\n"; + } + + // Apply the tail cancelation via the digital filter + DeConvExp(fDigits->GetDataAddress(iRow,iCol),fTimeTotal,nexp); + } // while irow icol - delete [] inADC; - delete [] outADC; - return; } //_____________________________________________________________________________ -void AliTRDclusterizer::DeConvExp(const Double_t *const source, Double_t *const target - ,const Int_t n, const Int_t nexp) +void AliTRDclusterizer::DeConvExp(Short_t *const arr, const Int_t nTime, const Int_t nexp) { // // Tail cancellation by deconvolution for PASA v4 TRF // - Double_t rates[2]; - Double_t coefficients[2]; + Float_t rates[2]; + Float_t coefficients[2]; // Initialization (coefficient = alpha, rates = lambda) - Double_t r1 = 1.0; - Double_t r2 = 1.0; - Double_t c1 = 0.5; - Double_t c2 = 0.5; + Float_t r1 = 1.0; + Float_t r2 = 1.0; + Float_t c1 = 0.5; + Float_t c2 = 0.5; if (nexp == 1) { // 1 Exponentials r1 = 1.156; @@ -1278,32 +1314,20 @@ void AliTRDclusterizer::DeConvExp(const Double_t *const source, Double_t *const Double_t dt = 0.1; rates[0] = TMath::Exp(-dt/(r1)); - rates[1] = TMath::Exp(-dt/(r2)); + rates[1] = (nexp == 1) ? .0 : TMath::Exp(-dt/(r2)); - Int_t i = 0; - Int_t k = 0; - - Double_t reminder[2]; - Double_t correction = 0.0; - Double_t result = 0.0; - - // Attention: computation order is important - for (k = 0; k < nexp; k++) { - reminder[k] = 0.0; - } - - for (i = 0; i < n; i++) { + Float_t reminder[2] = { .0, .0 }; + Float_t correction = 0.0; + Float_t result = 0.0; - result = (source[i] - correction); // No rescaling - target[i] = result; + for (int i = 0; i < nTime; i++) { - for (k = 0; k < nexp; k++) { - reminder[k] = rates[k] * (reminder[k] + coefficients[k] * result); - } + result = arr[i] - correction - fBaseline; // No rescaling + arr[i] = (Short_t)(result + fBaseline + 0.5f); correction = 0.0; - for (k = 0; k < nexp; k++) { - correction += reminder[k]; + for (int k = 0; k < 2; k++) { + correction += reminder[k] = rates[k] * (reminder[k] + coefficients[k] * result); } } @@ -1318,8 +1342,9 @@ void AliTRDclusterizer::ResetRecPoints() // if (fRecPoints) { - fRecPoints->Delete(); - delete fRecPoints; + fRecPoints->Clear(); + fNoOfClusters = 0; + // delete fRecPoints; } }