X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=TRD%2FAliTRDCalibraFillHisto.cxx;h=42603d89cb45dd776df3752296364fe91a864afc;hp=194f4682ce8048551102be5d4401ec9301445803;hb=5ebd79a85bb4d972ed19f200c05765fc7e342afb;hpb=09ea3770beee14f240b883e75507d6bb2a47765c diff --git a/TRD/AliTRDCalibraFillHisto.cxx b/TRD/AliTRDCalibraFillHisto.cxx index 194f4682ce8..42603d89cb4 100644 --- a/TRD/AliTRDCalibraFillHisto.cxx +++ b/TRD/AliTRDCalibraFillHisto.cxx @@ -57,25 +57,30 @@ #include "AliTRDCalibraMode.h" #include "AliTRDCalibraVector.h" #include "AliTRDCalibraVdriftLinearFit.h" +#include "AliTRDCalibraExbAltFit.h" #include "AliTRDcalibDB.h" #include "AliTRDCommonParam.h" #include "AliTRDpadPlane.h" #include "AliTRDcluster.h" -#include "AliTRDtrack.h" #include "AliTRDtrackV1.h" -#include "AliTRDrawStreamBase.h" #include "AliRawReader.h" #include "AliRawReaderDate.h" #include "AliTRDgeometry.h" +#include "AliTRDfeeParam.h" #include "./Cal/AliTRDCalROC.h" +#include "./Cal/AliTRDCalPad.h" #include "./Cal/AliTRDCalDet.h" -#include "AliTRDrawFastStream.h" #include "AliTRDdigitsManager.h" #include "AliTRDdigitsParam.h" #include "AliTRDSignalIndex.h" #include "AliTRDarrayADC.h" +#include "AliTRDrawStream.h" + +#include "AliCDBEntry.h" +#include "AliCDBManager.h" + #ifdef ALI_DATE #include "event.h" #endif @@ -126,6 +131,7 @@ void AliTRDCalibraFillHisto::Terminate() AliTRDCalibraFillHisto::AliTRDCalibraFillHisto() :TObject() ,fGeo(0) + ,fCalibDB(0) ,fIsHLT(kFALSE) ,fCH2dOn(kFALSE) ,fPH2dOn(kFALSE) @@ -134,6 +140,7 @@ AliTRDCalibraFillHisto::AliTRDCalibraFillHisto() ,fVector2d(kFALSE) ,fLinearFitterOn(kFALSE) ,fLinearFitterDebugOn(kFALSE) + ,fExbAltFitOn(kFALSE) ,fRelativeScale(0) ,fThresholdClusterPRF2(15.0) ,fLimitChargeIntegration(kFALSE) @@ -141,6 +148,18 @@ AliTRDCalibraFillHisto::AliTRDCalibraFillHisto() ,fNormalizeNbOfCluster(kFALSE) ,fMaxCluster(0) ,fNbMaxCluster(0) + ,fFirstRunGain(0) + ,fVersionGainUsed(0) + ,fSubVersionGainUsed(0) + ,fFirstRunGainLocal(0) + ,fVersionGainLocalUsed(0) + ,fSubVersionGainLocalUsed(0) + ,fFirstRunVdrift(0) + ,fVersionVdriftUsed(0) + ,fSubVersionVdriftUsed(0) + ,fFirstRunExB(0) + ,fVersionExBUsed(0) + ,fSubVersionExBUsed(0) ,fCalibraMode(new AliTRDCalibraMode()) ,fDebugStreamer(0) ,fDebugLevel(0) @@ -174,6 +193,7 @@ AliTRDCalibraFillHisto::AliTRDCalibraFillHisto() ,fCH2d(0x0) ,fLinearFitterArray(540) ,fLinearVdriftFit(0x0) + ,fExbAltFit(0x0) ,fCalDetGain(0x0) ,fCalROCGain(0x0) { @@ -191,13 +211,14 @@ AliTRDCalibraFillHisto::AliTRDCalibraFillHisto() fNumberUsedPh[1] = 0; fGeo = new AliTRDgeometry(); - + fCalibDB = AliTRDcalibDB::Instance(); } //______________________________________________________________________________________ AliTRDCalibraFillHisto::AliTRDCalibraFillHisto(const AliTRDCalibraFillHisto &c) :TObject(c) ,fGeo(0) + ,fCalibDB(0) ,fIsHLT(c.fIsHLT) ,fCH2dOn(c.fCH2dOn) ,fPH2dOn(c.fPH2dOn) @@ -206,6 +227,7 @@ AliTRDCalibraFillHisto::AliTRDCalibraFillHisto(const AliTRDCalibraFillHisto &c) ,fVector2d(c.fVector2d) ,fLinearFitterOn(c.fLinearFitterOn) ,fLinearFitterDebugOn(c.fLinearFitterDebugOn) + ,fExbAltFitOn(c.fExbAltFitOn) ,fRelativeScale(c.fRelativeScale) ,fThresholdClusterPRF2(c.fThresholdClusterPRF2) ,fLimitChargeIntegration(c.fLimitChargeIntegration) @@ -213,6 +235,18 @@ AliTRDCalibraFillHisto::AliTRDCalibraFillHisto(const AliTRDCalibraFillHisto &c) ,fNormalizeNbOfCluster(c.fNormalizeNbOfCluster) ,fMaxCluster(c.fMaxCluster) ,fNbMaxCluster(c.fNbMaxCluster) + ,fFirstRunGain(c.fFirstRunGain) + ,fVersionGainUsed(c.fVersionGainUsed) + ,fSubVersionGainUsed(c.fSubVersionGainUsed) + ,fFirstRunGainLocal(c.fFirstRunGainLocal) + ,fVersionGainLocalUsed(c.fVersionGainLocalUsed) + ,fSubVersionGainLocalUsed(c.fSubVersionGainLocalUsed) + ,fFirstRunVdrift(c.fFirstRunVdrift) + ,fVersionVdriftUsed(c.fVersionVdriftUsed) + ,fSubVersionVdriftUsed(c.fSubVersionVdriftUsed) + ,fFirstRunExB(c.fFirstRunExB) + ,fVersionExBUsed(c.fVersionExBUsed) + ,fSubVersionExBUsed(c.fSubVersionExBUsed) ,fCalibraMode(0x0) ,fDebugStreamer(0) ,fDebugLevel(c.fDebugLevel) @@ -246,6 +280,7 @@ AliTRDCalibraFillHisto::AliTRDCalibraFillHisto(const AliTRDCalibraFillHisto &c) ,fCH2d(0x0) ,fLinearFitterArray(540) ,fLinearVdriftFit(0x0) + ,fExbAltFit(0x0) ,fCalDetGain(0x0) ,fCalROCGain(0x0) { @@ -269,6 +304,9 @@ AliTRDCalibraFillHisto::AliTRDCalibraFillHisto(const AliTRDCalibraFillHisto &c) if(c.fLinearVdriftFit){ fLinearVdriftFit = new AliTRDCalibraVdriftLinearFit(*c.fLinearVdriftFit); } + if(c.fExbAltFit){ + fExbAltFit = new AliTRDCalibraExbAltFit(*c.fExbAltFit); + } if(c.fCalDetGain) fCalDetGain = new AliTRDCalDet(*c.fCalDetGain); if(c.fCalROCGain) fCalROCGain = new AliTRDCalROC(*c.fCalROCGain); @@ -277,6 +315,13 @@ AliTRDCalibraFillHisto::AliTRDCalibraFillHisto(const AliTRDCalibraFillHisto &c) delete fGeo; } fGeo = new AliTRDgeometry(); + fCalibDB = AliTRDcalibDB::Instance(); + + fNumberUsedCh[0] = 0; + fNumberUsedCh[1] = 0; + fNumberUsedPh[0] = 0; + fNumberUsedPh[1] = 0; + } //____________________________________________________________________________________ @@ -305,6 +350,7 @@ AliTRDCalibraFillHisto::~AliTRDCalibraFillHisto() if(f) { delete f;} } if(fLinearVdriftFit) delete fLinearVdriftFit; + if(fExbAltFit) delete fExbAltFit; if (fGeo) { delete fGeo; } @@ -396,12 +442,6 @@ Bool_t AliTRDCalibraFillHisto::Init2Dhistos(Int_t nboftimebin) fLinearFitterTracklet->StoreData(kTRUE); } - //calib object from database used for reconstruction - if( fCalDetGain ){ - fCalDetGain->~AliTRDCalDet(); - new(fCalDetGain) AliTRDCalDet(*(cal->GetGainFactorDet())); - }else fCalDetGain = new AliTRDCalDet(*(cal->GetGainFactorDet())); - // Calcul Xbins Chambd0, Chamb2 Int_t ntotal0 = CalculateTotalNumberOfBins(0); Int_t ntotal1 = CalculateTotalNumberOfBins(1); @@ -482,6 +522,17 @@ Bool_t AliTRDCalibraFillHisto::Init2Dhistos(Int_t nboftimebin) } } fLinearVdriftFit = new AliTRDCalibraVdriftLinearFit(); + TString nameee("Ver"); + nameee += fVersionExBUsed; + nameee += "Subver"; + nameee += fSubVersionExBUsed; + nameee += "FirstRun"; + nameee += fFirstRunExB; + nameee += "Nz"; + fLinearVdriftFit->SetNameCalibUsed(nameee); + } + if(fExbAltFitOn){ + fExbAltFit = new AliTRDCalibraExbAltFit(); } if (fPRF2dOn) { @@ -498,142 +549,114 @@ Bool_t AliTRDCalibraFillHisto::Init2Dhistos(Int_t nboftimebin) return kTRUE; } -//____________Offline tracking in the AliTRDtracker____________________________ -Bool_t AliTRDCalibraFillHisto::UpdateHistograms(const AliTRDtrack *t) +/////////////////////////////////////////////////////////////////////////////////////////////////////////////// +Bool_t AliTRDCalibraFillHisto::InitCalDet() { // - // Use AliTRDtrack for the calibration + // Init the Gain Cal Det // + // DB Setting + // Get cal + AliCDBEntry *entry = AliCDBManager::Instance()->Get("TRD/Calib/ChamberGainFactor",fFirstRunGain,fVersionGainUsed,fSubVersionGainUsed); + if(!entry) { + AliError("No gain det calibration entry found"); + return kFALSE; + } + AliTRDCalDet *calDet = (AliTRDCalDet *)entry->GetObject(); + if(!calDet) { + AliError("No calDet gain found"); + return kFALSE; + } + + + if( fCalDetGain ){ + fCalDetGain->~AliTRDCalDet(); + new(fCalDetGain) AliTRDCalDet(*(calDet)); + }else fCalDetGain = new AliTRDCalDet(*(calDet)); + + + // title CH2d + TString name("Ver"); + name += fVersionGainUsed; + name += "Subver"; + name += fSubVersionGainUsed; + name += "FirstRun"; + name += fFirstRunGain; + name += "Nz"; + name += fCalibraMode->GetNz(0); + name += "Nrphi"; + name += fCalibraMode->GetNrphi(0); + + fCH2d->SetTitle(name); + + // title PH2d + TString namee("Ver"); + namee += fVersionVdriftUsed; + namee += "Subver"; + namee += fSubVersionVdriftUsed; + namee += "FirstRun"; + namee += fFirstRunVdrift; + namee += "Nz"; + namee += fCalibraMode->GetNz(1); + namee += "Nrphi"; + namee += fCalibraMode->GetNrphi(1); - AliTRDcluster *cl = 0x0; // pointeur to cluster - Int_t index0 = 0; // index of the first cluster in the current chamber - Int_t index1 = 0; // index of the current cluster in the current chamber + fPH2d->SetTitle(namee); - ////////////////////////////// - // loop over the clusters - /////////////////////////////// - while((cl = t->GetCluster(index1))){ + // title AliTRDCalibraVdriftLinearFit + TString nameee("Ver"); + nameee += fVersionExBUsed; + nameee += "Subver"; + nameee += fSubVersionExBUsed; + nameee += "FirstRun"; + nameee += fFirstRunExB; + nameee += "Nz"; - ///////////////////////////////////////////////////////////////////////// - // Fill the infos for the previous clusters if not the same detector - //////////////////////////////////////////////////////////////////////// - Int_t detector = cl->GetDetector(); - if ((detector != fDetectorPreviousTrack) && - (index0 != index1)) { - - fNumberTrack++; - - //If the same track, then look if the previous detector is in - //the same plane, if yes: not a good track - if ((GetLayer(detector) == GetLayer(fDetectorPreviousTrack))) { - return kFALSE; - } - - // Fill only if the track doesn't touch a masked pad or doesn't - if (fGoodTracklet) { - - // drift velocity unables to cut bad tracklets - Bool_t pass = FindP1TrackPHtracklet(t,index0,index1); - - // Gain calibration - if (fCH2dOn) { - FillTheInfoOfTheTrackCH(index1-index0); - } - - // PH calibration - if (fPH2dOn) { - FillTheInfoOfTheTrackPH(); - } - - if(pass && fPRF2dOn) HandlePRFtracklet(t,index0,index1); - - - } // if a good tracklet - - // reset stuff - ResetfVariablestracklet(); - index0 = index1; - - } // Fill at the end the charge + + fLinearVdriftFit->SetNameCalibUsed(nameee); - ///////////////////////////////////////////////////////////// - // Localise and take the calib gain object for the detector - //////////////////////////////////////////////////////////// - if (detector != fDetectorPreviousTrack) { - - //Localise the detector - LocalisationDetectorXbins(detector); - - // Get cal - AliTRDcalibDB *cal = AliTRDcalibDB::Instance(); - if (!cal) { - AliInfo("Could not get calibDB"); - return kFALSE; - } - - // Get calib objects - if( fCalROCGain ){ - if(!fIsHLT){ - fCalROCGain->~AliTRDCalROC(); - new(fCalROCGain) AliTRDCalROC(*(cal->GetGainFactorROC(detector))); - } - }else fCalROCGain = new AliTRDCalROC(*(cal->GetGainFactorROC(detector))); - - } - - // Reset the detectbjobsor - fDetectorPreviousTrack = detector; - /////////////////////////////////////// - // Store the info of the cluster - /////////////////////////////////////// - Int_t row = cl->GetPadRow(); - Int_t col = cl->GetPadCol(); - CheckGoodTrackletV1(cl); - Int_t group[2] = {0,0}; - if(fCH2dOn) group[0] = CalculateCalibrationGroup(0,row,col); - if(fPH2dOn) group[1] = CalculateCalibrationGroup(1,row,col); - StoreInfoCHPHtrack(cl,t->GetClusterdQdl(index1),group,row,col); - - index1++; + return kTRUE; - } // while on clusters +} +/////////////////////////////////////////////////////////////////////////////////////////////////////////////// +Bool_t AliTRDCalibraFillHisto::InitCalPad(Int_t detector) +{ + // + // Init the Gain Cal Pad + // - /////////////////////////// - // Fill the last plane - ////////////////////////// - if( index0 != index1 ){ - - fNumberTrack++; - - if (fGoodTracklet) { - - // drift velocity unables to cut bad tracklets - Bool_t pass = FindP1TrackPHtracklet(t,index0,index1); - - // Gain calibration - if (fCH2dOn) { - FillTheInfoOfTheTrackCH(index1-index0); - } - - // PH calibration - if (fPH2dOn) { - FillTheInfoOfTheTrackPH(); - } - - if(pass && fPRF2dOn) HandlePRFtracklet(t,index0,index1); - - } // if a good tracklet - + // DB Setting + // Get cal + AliCDBEntry *entry = AliCDBManager::Instance()->Get("TRD/Calib/LocalGainFactor",AliCDBManager::Instance()->GetRun(),fVersionGainLocalUsed,fSubVersionGainLocalUsed); + if(!entry) { + AliError("No gain pad calibration entry found"); + return kFALSE; + } + AliTRDCalPad *calPad = (AliTRDCalPad *)entry->GetObject(); + if(!calPad) { + AliError("No calPad gain found"); + return kFALSE; + } + AliTRDCalROC *calRoc = (AliTRDCalROC *)calPad->GetCalROC(detector); + if(!calRoc) { + AliError("No calRoc gain found"); + return kFALSE; } + + if( fCalROCGain ){ + fCalROCGain->~AliTRDCalROC(); + new(fCalROCGain) AliTRDCalROC(*(calRoc)); + }else fCalROCGain = new AliTRDCalROC(*(calRoc)); + - // reset stuff - ResetfVariablestracklet(); - - return kTRUE; + + + return kTRUE; + } //____________Offline tracking in the AliTRDtracker____________________________ Bool_t AliTRDCalibraFillHisto::UpdateHistogramsV1(const AliTRDtrackV1 *t) @@ -649,11 +672,18 @@ Bool_t AliTRDCalibraFillHisto::UpdateHistogramsV1(const AliTRDtrackV1 *t) Bool_t newtr = kTRUE; // new track // Get cal - AliTRDcalibDB *cal = AliTRDcalibDB::Instance(); + // AliTRDcalibDB *cal = AliTRDcalibDB::Instance(); + /* if (!cal) { AliInfo("Could not get calibDB"); return kFALSE; } +*/ + if (!fCalibDB) { + AliInfo("Could not get calibDB"); + return kFALSE; + } + /////////////////////////// // loop over the tracklet @@ -684,13 +714,8 @@ Bool_t AliTRDCalibraFillHisto::UpdateHistogramsV1(const AliTRDtrackV1 *t) //Localise the detector bin LocalisationDetectorXbins(detector); // Get calib objects - if( fCalROCGain ){ - if(!fIsHLT){ - fCalROCGain->~AliTRDCalROC(); - new(fCalROCGain) AliTRDCalROC(*(cal->GetGainFactorROC(detector))); - } - }else fCalROCGain = new AliTRDCalROC(*(cal->GetGainFactorROC(detector))); - + if(!fIsHLT) InitCalPad(detector); + // reset fDetectorPreviousTrack = detector; } @@ -714,7 +739,7 @@ Bool_t AliTRDCalibraFillHisto::UpdateHistogramsV1(const AliTRDtrackV1 *t) // Add the charge if shared cluster cls = tracklet->GetClusters(jc+AliTRDseedV1::kNtb); // - StoreInfoCHPHtrack(cl, tracklet->GetdQdl(jc),group,row,col,cls); + StoreInfoCHPHtrack(cl, tracklet->GetQperTB(jc),group,row,col,cls); //tracklet->GetdQdl(jc) } //////////////////////////////////////// @@ -749,146 +774,6 @@ Bool_t AliTRDCalibraFillHisto::UpdateHistogramsV1(const AliTRDtrackV1 *t) // Routine inside the update with AliTRDtrack /////////////////////////////////////////////////////////////////////////////////// //____________Offine tracking in the AliTRDtracker_____________________________ -Bool_t AliTRDCalibraFillHisto::FindP1TrackPHtracklet(const AliTRDtrack *t, Int_t index0, Int_t index1) -{ - // - // Drift velocity calibration: - // Fit the clusters with a straight line - // From the slope find the drift velocity - // - - //Number of points: if less than 3 return kFALSE - Int_t npoints = index1-index0; - if(npoints <= 2) return kFALSE; - - ///////////////// - //Variables - //////////////// - Int_t detector = ((AliTRDcluster *) t->GetCluster(index0))->GetDetector(); //detector - // parameters of the track - Double_t snp = t->GetSnpPlane(GetLayer(detector)); // sin angle in the plan yx track - Double_t tgl = t->GetTglPlane(GetLayer(detector)); // dz/dl and not dz/dx! - Double_t tnp = 0.0; // tan angle in the plan xy track - if( TMath::Abs(snp) < 1.){ - tnp = snp / TMath::Sqrt((1.-snp)*(1.+snp)); - } - Float_t dzdx = tgl*TMath::Sqrt(1+tnp*tnp); // dz/dx now from dz/dl - // tilting pad and cross row - Int_t crossrow = 0; // if it crosses a pad row - Int_t rowp = -1; // if it crosses a pad row - AliTRDpadPlane *padplane = fGeo->GetPadPlane(GetLayer(detector),GetStack(detector)); - Double_t tiltingangle = padplane->GetTiltingAngle(); // tiltingangle of the pad - Float_t tnt = TMath::Tan(tiltingangle/180.*TMath::Pi()); // tan tiltingangle - // linear fit - fLinearFitterTracklet->ClearPoints(); - Double_t dydt = 0.0; // dydt tracklet after straight line fit - Double_t errorpar = 0.0; // error after straight line fit on dy/dt - Double_t pointError = 0.0; // error after straight line fit - Int_t nbli = 0; // number linear fitter points - - ////////////////////////////// - // loop over clusters - //////////////////////////// - for(Int_t k = 0; k < npoints; k++){ - - AliTRDcluster *cl = (AliTRDcluster *) t->GetCluster(k+index0); - if((fLimitChargeIntegration) && (!cl->IsInChamber())) continue; - Double_t ycluster = cl->GetY(); - Int_t time = cl->GetPadTime(); - Double_t timeis = time/fSf; - //Double_t q = cl->GetQ(); - //See if cross two pad rows - Int_t row = cl->GetPadRow(); - if(k==0) rowp = row; - if(row != rowp) crossrow = 1; - - fLinearFitterTracklet->AddPoint(&timeis,ycluster,1); - nbli++; - - } - - ////////////////////////////// - // linear fit - ////////////////////////////// - if(nbli <= 2){ - fLinearFitterTracklet->ClearPoints(); - return kFALSE; - } - TVectorD pars; - fLinearFitterTracklet->Eval(); - fLinearFitterTracklet->GetParameters(pars); - pointError = TMath::Sqrt(fLinearFitterTracklet->GetChisquare()/(nbli-2)); - errorpar = fLinearFitterTracklet->GetParError(1)*pointError; - dydt = pars[1]; - fLinearFitterTracklet->ClearPoints(); - - ///////////////////////////// - // debug - //////////////////////////// - if(fDebugLevel > 0){ - if ( !fDebugStreamer ) { - //debug stream - TDirectory *backup = gDirectory; - fDebugStreamer = new TTreeSRedirector("TRDdebugCalibraFill.root"); - if ( backup ) backup->cd(); //we don't want to be cd'd to the debug streamer - } - - - (* fDebugStreamer) << "FindP1TrackPHtracklet0"<< - //"snpright="< fNumberClustersf) return kFALSE; - if(pointError >= 0.1) return kFALSE; - if(crossrow == 1) return kFALSE; - - //////////////////////////// - // fill - //////////////////////////// - if(fLinearFitterOn){ - //Add to the linear fitter of the detector - if( TMath::Abs(snp) < 1.){ - Double_t x = tnp-dzdx*tnt; - if(fLinearFitterDebugOn) { - (GetLinearFitter(detector,kTRUE))->AddPoint(&x,dydt); - fEntriesLinearFitter[detector]++; - } - fLinearVdriftFit->Update(detector,x,pars[1]); - } - } - - return kTRUE; -} -//____________Offine tracking in the AliTRDtracker_____________________________ Bool_t AliTRDCalibraFillHisto::FindP1TrackPHtrackletV1(const AliTRDseedV1 *tracklet, Int_t nbclusters) { // @@ -941,419 +826,162 @@ Bool_t AliTRDCalibraFillHisto::FindP1TrackPHtrackletV1(const AliTRDseedV1 *track //////////////////////////// Int_t nbli = 0; AliTRDcluster *cl = 0x0; - ////////////////////////////// - // Check no shared clusters - ////////////////////////////// - for(int icc=AliTRDseedV1::kNtb; iccGetClusters(icc))) crossrow = 1; - } - ////////////////////////////////// - // Loop clusters - ////////////////////////////////// - for(int ic=0; icGetClusters(ic))) continue; - if((fLimitChargeIntegration) && (!cl->IsInChamber())) continue; - - Double_t ycluster = cl->GetY(); - Int_t time = cl->GetPadTime(); - Double_t timeis = time/fSf; - //See if cross two pad rows - Int_t row = cl->GetPadRow(); - if(rowp==-1) rowp = row; - if(row != rowp) crossrow = 1; - - fLinearFitterTracklet->AddPoint(&timeis,ycluster,1); - nbli++; - - - } - - //////////////////////////////////// - // Do the straight line fit now - /////////////////////////////////// - if(nbli <= 2){ - fLinearFitterTracklet->ClearPoints(); - return kFALSE; - } - TVectorD pars; - fLinearFitterTracklet->Eval(); - fLinearFitterTracklet->GetParameters(pars); - pointError = TMath::Sqrt(fLinearFitterTracklet->GetChisquare()/(nbli-2)); - errorpar = fLinearFitterTracklet->GetParError(1)*pointError; - dydt = pars[1]; - //printf("chis %f, nbli %d, pointError %f, parError %f, errorpar %f\n",fLinearFitterTracklet->GetChisquare(),nbli,pointError,fLinearFitterTracklet->GetParError(1),errorpar); - fLinearFitterTracklet->ClearPoints(); - - //////////////////////////////// - // Debug stuff - /////////////////////////////// - - - if(fDebugLevel > 0){ - if ( !fDebugStreamer ) { - //debug stream - TDirectory *backup = gDirectory; - fDebugStreamer = new TTreeSRedirector("TRDdebugCalibraFill.root"); - if ( backup ) backup->cd(); //we don't want to be cd'd to the debug streamer - } - - - Int_t layer = GetLayer(fDetectorPreviousTrack); - - (* fDebugStreamer) << "FindP1TrackPHtrackletV1"<< - //"snpright="< fNumberClustersf) return kFALSE; - if(pointError >= 0.3) return kFALSE; - if(crossrow == 1) return kFALSE; - - /////////////////////// - // Fill - ////////////////////// - - if(fLinearFitterOn){ - //Add to the linear fitter of the detector - if( TMath::Abs(snp) < 1.){ - Double_t x = tnp-dzdx*tnt; - if(fLinearFitterDebugOn) { - (GetLinearFitter(fDetectorPreviousTrack,kTRUE))->AddPoint(&x,dydt); - fEntriesLinearFitter[fDetectorPreviousTrack]++; - } - fLinearVdriftFit->Update(fDetectorPreviousTrack,x,pars[1]); - } - } - - return kTRUE; -} -//____________Offine tracking in the AliTRDtracker_____________________________ -Bool_t AliTRDCalibraFillHisto::HandlePRFtracklet(const AliTRDtrack *t, Int_t index0, Int_t index1) -{ - // - // PRF width calibration - // Assume a Gaussian shape: determinate the position of the three pad clusters - // Fit with a straight line - // Take the fitted values for all the clusters (3 or 2 pad clusters) - // Fill the PRF as function of angle of the track - // - // - - - ////////////////////////// - // variables - ///////////////////////// - Int_t npoints = index1-index0; // number of total points - Int_t nb3pc = 0; // number of three pads clusters used for fit - Int_t detector = ((AliTRDcluster *) t->GetCluster(index0))->GetDetector(); // detector - // To see the difference due to the fit - Double_t *padPositions; - padPositions = new Double_t[npoints]; - for(Int_t k = 0; k < npoints; k++){ - padPositions[k] = 0.0; - } - // Take the tgl and snp with the track t now - Double_t tgl = t->GetTglPlane(GetLayer(detector)); //dz/dl and not dz/dx - Double_t snp = t->GetSnpPlane(GetLayer(detector)); // sin angle in xy plan - Float_t dzdx = 0.0; // dzdx - Float_t tnp = 0.0; - if(TMath::Abs(snp) < 1.0){ - tnp = snp / TMath::Sqrt((1.-snp)*(1.+snp)); - dzdx = tgl*TMath::Sqrt(1+tnp*tnp); - } - // linear fitter - fLinearFitterTracklet->ClearPoints(); - - /////////////////////////// - // calcul the tnp group - /////////////////////////// - Bool_t echec = kFALSE; - Double_t shift = 0.0; - //Calculate the shift in x coresponding to this tnp - if(fNgroupprf != 0.0){ - shift = -3.0*(fNgroupprf-1)-1.5; - Double_t limithigh = -0.2*(fNgroupprf-1); - if((tnp < (-0.2*fNgroupprf)) || (tnp > (0.2*fNgroupprf))) echec = kTRUE; - else{ - while(tnp > limithigh){ - limithigh += 0.2; - shift += 3.0; - } - } - } - if(echec) { - delete [] padPositions; - return kFALSE; - } - - ////////////////////// - // loop clusters - ///////////////////// - for(Int_t k = 0; k < npoints; k++){ - //Take the cluster - AliTRDcluster *cl = (AliTRDcluster *) t->GetCluster(k+index0); - if(!cl) continue; - Short_t *signals = cl->GetSignals(); - Double_t time = cl->GetPadTime(); - //Calculate x if possible - Float_t xcenter = 0.0; - Bool_t echec1 = kTRUE; - if((time<=7) || (time>=21)) continue; - // Center 3 balanced: position with the center of the pad - if ((((Float_t) signals[3]) > 0.0) && - (((Float_t) signals[2]) > 0.0) && - (((Float_t) signals[4]) > 0.0)) { - echec1 = kFALSE; - // Security if the denomiateur is 0 - if ((((Float_t) (((Float_t) signals[3]) * ((Float_t) signals[3]))) / - ((Float_t) (((Float_t) signals[2]) * ((Float_t) signals[4])))) != 1.0) { - xcenter = 0.5 * (TMath::Log((Float_t) (((Float_t) signals[4]) / ((Float_t) signals[2])))) - / (TMath::Log(((Float_t) (((Float_t) signals[3]) * ((Float_t) signals[3]))) - / ((Float_t) (((Float_t) signals[2]) * ((Float_t) signals[4]))))); - } - else { - echec1 = kTRUE; - } - } - if(TMath::Abs(xcenter) > 0.5) echec = kTRUE; - if(echec) continue; - //if no echec: calculate with the position of the pad - // Position of the cluster - Double_t padPosition = xcenter + cl->GetPadCol(); - padPositions[k] = padPosition; - nb3pc++; - fLinearFitterTracklet->AddPoint(&time, padPosition,1); - }//clusters loop - - - ///////////////////////////// - // fit - //////////////////////////// - if(nb3pc < 3) { - delete [] padPositions; - fLinearFitterTracklet->ClearPoints(); - return kFALSE; - } - fLinearFitterTracklet->Eval(); - TVectorD line(2); - fLinearFitterTracklet->GetParameters(line); - Float_t pointError = -1.0; - if( fLinearFitterTracklet->GetChisquare()>=0.0) { - pointError = TMath::Sqrt( fLinearFitterTracklet->GetChisquare()/(nb3pc-2)); - } - fLinearFitterTracklet->ClearPoints(); - - ///////////////////////////////////////////////////// - // Now fill the PRF: second loop over clusters - ///////////////////////////////////////////////////// - for(Int_t k = 0; k < npoints; k++){ - //Take the cluster - AliTRDcluster *cl = (AliTRDcluster *) t->GetCluster(k+index0); - Short_t *signals = cl->GetSignals(); // signal - Double_t time = cl->GetPadTime(); // time bin - Float_t padPosTracklet = line[0]+line[1]*time; // reconstruct position from fit - Float_t padPos = cl->GetPadCol(); // middle pad - Double_t dpad = padPosTracklet - padPos; // reconstruct position relative to middle pad from fit - Float_t ycenter = 0.0; // relative center charge - Float_t ymin = 0.0; // relative left charge - Float_t ymax = 0.0; // relative right charge - - //Requiere simply two pads clusters at least - if(((((Float_t) signals[3]) > 0.0) && (((Float_t) signals[2]) > 0.0)) || - ((((Float_t) signals[3]) > 0.0) && (((Float_t) signals[4]) > 0.0))){ - Float_t sum = ((Float_t) signals[2]) + ((Float_t) signals[3]) + ((Float_t) signals[4]); - if(sum > 0.0) ycenter = ((Float_t) signals[3])/ sum; - if(sum > 0.0) ymin = ((Float_t) signals[2])/ sum; - if(sum > 0.0) ymax = ((Float_t) signals[4])/ sum; - } - - //calibration group - Int_t rowcl = cl->GetPadRow(); // row of cluster - Int_t colcl = cl->GetPadCol(); // col of cluster - Int_t grouplocal = CalculateCalibrationGroup(2,rowcl,colcl); // calcul the corresponding group - Int_t caligroup = fCalibraMode->GetXbins(2)+ grouplocal; // calcul the corresponding group - Float_t xcl = cl->GetY(); // y cluster - Float_t qcl = cl->GetQ(); // charge cluster - Int_t layer = GetLayer(detector); // layer - Int_t stack = GetStack(detector); // stack - Double_t xdiff = dpad; // reconstructed position constant - Double_t x = dpad; // reconstructed position moved - Float_t ep = pointError; // error of fit - Float_t signal1 = (Float_t)signals[1]; // signal at the border - Float_t signal3 = (Float_t)signals[3]; // signal - Float_t signal2 = (Float_t)signals[2]; // signal - Float_t signal4 = (Float_t)signals[4]; // signal - Float_t signal5 = (Float_t)signals[5]; // signal at the border - - ////////////////////////////// - // debug - ///////////////////////////// - if(fDebugLevel > 0){ - if ( !fDebugStreamer ) { - //debug stream - TDirectory *backup = gDirectory; - fDebugStreamer = new TTreeSRedirector("TRDdebugCalibraFill.root"); - if ( backup ) backup->cd(); //we don't want to be cd'd to the debug streamer - } - - - x = xdiff; - Int_t type=0; - Float_t y = ycenter; - (* fDebugStreamer) << "HandlePRFtracklet"<< - "caligroup="< fNumberClustersf) continue; - if(nb3pc <= 5) continue; - if((time >= 21) || (time < 7)) continue; - if(TMath::Abs(snp) >= 1.0) continue; - if(TMath::Abs(qcl) < 80) continue; - - //////////////////////////// - // Fill - /////////////////////////// - if (fHisto2d) { - if(TMath::Abs(dpad) < 1.5) { - fPRF2d->Fill(shift+dpad,(caligroup+0.5),ycenter); - fPRF2d->Fill(shift-dpad,(caligroup+0.5),ycenter); - } - if((ymin > 0.0) && (TMath::Abs(dpad+1.0) < 1.5)) { - fPRF2d->Fill(shift-(dpad+1.0),(caligroup+0.5),ymin); - fPRF2d->Fill(shift+(dpad+1.0),(caligroup+0.5),ymin); - } - if((ymax > 0.0) && (TMath::Abs(dpad-1.0) < 1.5)) { - fPRF2d->Fill(shift+1.0-dpad,(caligroup+0.5),ymax); - fPRF2d->Fill(shift-1.0+dpad,(caligroup+0.5),ymax); - } + ////////////////////////////// + // Check no shared clusters + ////////////////////////////// + for(int icc=AliTRDseedV1::kNtb; iccGetClusters(icc); + if(cl) crossrow = 1; + } + ////////////////////////////////// + // Loop clusters + ////////////////////////////////// + + Float_t sigArr[AliTRDfeeParam::GetNcol()]; + memset(sigArr, 0, AliTRDfeeParam::GetNcol()*sizeof(sigArr[0])); + Int_t ncl=0, tbf=0, tbl=0; + + for(int ic=0; icGetClusters(ic))) continue; + + if(!tbf) tbf=ic; + tbl=ic; + ncl++; + Int_t col = cl->GetPadCol(); + for(int ip=-1, jp=2; jp<5; ip++, jp++){ + Int_t idx=col+ip; + if(idx<0 || idx>=AliTRDfeeParam::GetNcol()) continue; + sigArr[idx]+=((Float_t)cl->GetSignals()[jp]); } - if (fVector2d) { - if(TMath::Abs(dpad) < 1.5) { - fCalibraVector->UpdateVectorPRF(fDetectorPreviousTrack,grouplocal,shift+dpad,ycenter); - fCalibraVector->UpdateVectorPRF(fDetectorPreviousTrack,grouplocal,shift-dpad,ycenter); - } - if((ymin > 0.0) && (TMath::Abs(dpad+1.0) < 1.5)) { - fCalibraVector->UpdateVectorPRF(fDetectorPreviousTrack,grouplocal,shift-(dpad+1.0),ymin); - fCalibraVector->UpdateVectorPRF(fDetectorPreviousTrack,grouplocal,shift+(dpad+1.0),ymin); - } - if((ymax > 0.0) && (TMath::Abs(dpad-1.0) < 1.5)) { - fCalibraVector->UpdateVectorPRF(fDetectorPreviousTrack,grouplocal,shift+1.0-dpad,ymax); - fCalibraVector->UpdateVectorPRF(fDetectorPreviousTrack,grouplocal,shift-1.0+dpad,ymax); + + if((fLimitChargeIntegration) && (!cl->IsInChamber())) continue; + + Double_t ycluster = cl->GetY(); + Int_t time = cl->GetPadTime(); + Double_t timeis = time/fSf; + //See if cross two pad rows + Int_t row = cl->GetPadRow(); + if(rowp==-1) rowp = row; + if(row != rowp) crossrow = 1; + + fLinearFitterTracklet->AddPoint(&timeis,ycluster,1); + nbli++; + + + } + + //////////////////////////////////// + // Do the straight line fit now + /////////////////////////////////// + if(nbli <= 2){ + fLinearFitterTracklet->ClearPoints(); + return kFALSE; + } + TVectorD pars; + fLinearFitterTracklet->Eval(); + fLinearFitterTracklet->GetParameters(pars); + pointError = TMath::Sqrt(TMath::Abs(fLinearFitterTracklet->GetChisquare()/(nbli-2))); + errorpar = fLinearFitterTracklet->GetParError(1)*pointError; + dydt = pars[1]; + //printf("chis %f, nbli %d, pointError %f, parError %f, errorpar %f\n",fLinearFitterTracklet->GetChisquare(),nbli,pointError,fLinearFitterTracklet->GetParError(1),errorpar); + fLinearFitterTracklet->ClearPoints(); + + //////////////////////////////////// + // Calc the projection of the clusters on the y direction + /////////////////////////////////// + + Float_t signalSum(0.); + Float_t mean = 0.0, rms = 0.0; + Float_t dydx = tracklet->GetYref(1), tilt = tracklet->GetTilt(); // ,dzdx = tracklet->GetZref(1); (identical to the previous definition!) + Float_t dz = dzdx*(tbl-tbf)/10; + if(ncl>10){ + for(Int_t ip(0); ip 0.0) mean/=signalSum; + + for(Int_t ip = 0; ip 0.0) rms = TMath::Sqrt(TMath::Abs(rms/signalSum)); + + rms -= TMath::Abs(dz*tilt); + dydx -= dzdx*tilt; + } + + //////////////////////////////// + // Debug stuff + /////////////////////////////// + + + //if(fDebugLevel > 0){ + if ( !fDebugStreamer ) { + //debug stream + TDirectory *backup = gDirectory; + fDebugStreamer = new TTreeSRedirector("TRDdebugCalibraFill.root"); + if ( backup ) backup->cd(); //we don't want to be cd'd to the debug streamer + } + + float xcoord = tnp-dzdx*tnt; + float pt = tracklet->GetPt(); + Int_t layer = GetLayer(fDetectorPreviousTrack); + + (* fDebugStreamer) << "FindP1TrackPHtrackletV1"<< + //"snpright="< fNumberClustersf) return kFALSE; + if(pointError >= 0.3) return kFALSE; + if(crossrow == 1) return kTRUE; + + /////////////////////// + // Fill + ////////////////////// + + if(fLinearFitterOn){ + //Add to the linear fitter of the detector + if( TMath::Abs(snp) < 1.){ + Double_t x = tnp-dzdx*tnt; + if(fLinearFitterDebugOn) { + (GetLinearFitter(fDetectorPreviousTrack,kTRUE))->AddPoint(&x,dydt); + fEntriesLinearFitter[fDetectorPreviousTrack]++; } + fLinearVdriftFit->Update(fDetectorPreviousTrack,x,pars[1]); } } - delete [] padPositions; - return kTRUE; + if(fExbAltFitOn){ + fExbAltFit->Update(fDetectorPreviousTrack,dydx,rms); + } + return kTRUE; } //____________Offine tracking in the AliTRDtracker_____________________________ Bool_t AliTRDCalibraFillHisto::HandlePRFtrackletV1(const AliTRDseedV1 *tracklet, Int_t nbclusters) @@ -1426,9 +1054,11 @@ Bool_t AliTRDCalibraFillHisto::HandlePRFtrackletV1(const AliTRDseedV1 *tracklet, for(int ic=0; icGetClusters(ic+AliTRDseedV1::kNtb))) continue; + cl = tracklet->GetClusters(ic+AliTRDseedV1::kNtb); + if(cl) continue; } - if(!(cl = tracklet->GetClusters(ic))) continue; + cl = tracklet->GetClusters(ic); + if(!cl) continue; Double_t time = cl->GetPadTime(); if((time<=7) || (time>=21)) continue; Short_t *signals = cl->GetSignals(); @@ -1492,9 +1122,11 @@ Bool_t AliTRDCalibraFillHisto::HandlePRFtrackletV1(const AliTRDseedV1 *tracklet, ////////////////////////////////////////////// for(int ic=0; icGetClusters(ic+AliTRDseedV1::kNtb))) continue; + cl = tracklet->GetClusters(ic+AliTRDseedV1::kNtb); + if(((ic+AliTRDseedV1::kNtb) < AliTRDseedV1::kNclusters) && (cl)) continue; // - if(!(cl = tracklet->GetClusters(ic))) continue; + cl = tracklet->GetClusters(ic); + if(!cl) continue; Short_t *signals = cl->GetSignals(); // signal Double_t time = cl->GetPadTime(); // time bin @@ -1745,8 +1377,8 @@ Bool_t AliTRDCalibraFillHisto::IsPadOn(Int_t detector, Int_t row, Int_t col) con return kFALSE; } - if (!cal->IsChamberInstalled(detector) || - cal->IsChamberMasked(detector) || + if (!cal->IsChamberGood(detector) || + cal->IsChamberNoData(detector) || cal->IsPadMasked(detector,col,row)) { return kFALSE; } @@ -1953,7 +1585,7 @@ void AliTRDCalibraFillHisto::StoreInfoCHPHtrack(const AliTRDcluster *cl,const Do if(fIsHLT) correctthegain = fCalDetGain->GetValue(fDetectorPreviousTrack); else correctthegain = fCalDetGain->GetValue(fDetectorPreviousTrack)*fCalROCGain->GetValue(col,row); Float_t correction = 1.0; - Float_t normalisation = 6.67; + Float_t normalisation = 1.13; //org: 6.67; 1st: 1.056; 2nd: 1.13; // we divide with gain in AliTRDclusterizer::Transform... if( correctthegain > 0 ) normalisation /= correctthegain; @@ -2115,7 +1747,7 @@ void AliTRDCalibraFillHisto::FillTheInfoOfTheTrackCH(Int_t nbclusters) } break; default: break; - } + } } //____________Offine tracking in the AliTRDtracker_____________________________ void AliTRDCalibraFillHisto::FillTheInfoOfTheTrackPH() @@ -2328,230 +1960,10 @@ void AliTRDCalibraFillHisto::FillTheInfoOfTheTrackPH() // DAQ process functions ///////////////////////////////////////////////////////////////////////////////////////// //_____________________________________________________________________ -Int_t AliTRDCalibraFillHisto::ProcessEventDAQ(AliTRDrawStreamBase *rawStream, Bool_t nocheck) -{ - // - // Event Processing loop - AliTRDrawStreamBase - // TestBeam 2007 version - // 0 timebin problem - // 1 no input - // 2 input - // Same algorithm as TestBeam but different reader - // - - rawStream->SetSharedPadReadout(kFALSE); - - Int_t withInput = 1; - - Double_t phvalue[16][144][36]; - for(Int_t k = 0; k < 36; k++){ - for(Int_t j = 0; j < 16; j++){ - for(Int_t c = 0; c < 144; c++){ - phvalue[j][c][k] = 0.0; - } - } - } - - fDetectorPreviousTrack = -1; - fMCMPrevious = -1; - fROBPrevious = -1; - Int_t nbtimebin = 0; - Int_t baseline = 10; - //printf("------------Detector\n"); - - if(!nocheck){ - - fTimeMax = 0; - - while (rawStream->Next()) { - - Int_t idetector = rawStream->GetDet(); // current detector - Int_t imcm = rawStream->GetMCM(); // current MCM - Int_t irob = rawStream->GetROB(); // current ROB - - //printf("Detector %d\n",idetector); - - if((fDetectorPreviousTrack != idetector) && (fDetectorPreviousTrack != -1)){ - - // Fill - withInput = TMath::Max(FillDAQ(phvalue),withInput); - - - // reset - for(Int_t k = 0; k < 36; k++){ - for(Int_t j = 0; j < 16; j++){ - for(Int_t c = 0; c < 144; c++){ - phvalue[j][c][k] = 0.0; - } - } - } - } - - fDetectorPreviousTrack = idetector; - fMCMPrevious = imcm; - fROBPrevious = irob; - - nbtimebin = rawStream->GetNumberOfTimeBins(); // number of time bins read from data - if(nbtimebin == 0) return 0; - if((fTimeMax != 0) && (nbtimebin != fTimeMax)) return 0; - fTimeMax = nbtimebin; - - //baseline = rawStream->GetCommonAdditive(); // common additive baseline - fNumberClustersf = fTimeMax; - fNumberClusters = (Int_t)(fNumberClustersProcent*fTimeMax); - - - Int_t *signal = rawStream->GetSignals(); // current ADC signal - Int_t col = rawStream->GetCol(); - Int_t row = rawStream->GetRow(); - - - // printf("detector %d, signal[0] %d, signal[1] %d, signal[2] %d, baseline %d\n",idetector,signal[0],signal[1],signal[2], baseline); - - - for(Int_t itime = 0; itime < nbtimebin; itime++){ - phvalue[row][col][itime] = signal[itime]-baseline; - } - } - - // fill the last one - if(fDetectorPreviousTrack != -1){ - - // Fill - withInput = TMath::Max(FillDAQ(phvalue),withInput); - - // reset - for(Int_t k = 0; k < 36; k++){ - for(Int_t j = 0; j < 16; j++){ - for(Int_t c = 0; c < 144; c++){ - phvalue[j][c][k] = 0.0; - } - } - } - } - - } - else{ - - while (rawStream->Next()) { //iddetecte - - Int_t idetector = rawStream->GetDet(); // current detector - Int_t imcm = rawStream->GetMCM(); // current MCM - Int_t irob = rawStream->GetROB(); // current ROB - - //printf("Detector %d\n",idetector); - - if((fDetectorPreviousTrack != idetector) && (fDetectorPreviousTrack != -1)){ - - // Fill - withInput = TMath::Max(FillDAQ(phvalue),withInput); - - // reset - for(Int_t k = 0; k < 36; k++){ - for(Int_t j = 0; j < 16; j++){ - for(Int_t c = 0; c < 144; c++){ - phvalue[j][c][k] = 0.0; - } - } - } - } - - fDetectorPreviousTrack = idetector; - fMCMPrevious = imcm; - fROBPrevious = irob; - - //baseline = rawStream->GetCommonAdditive(); // common baseline - - fTimeMax = rawStream->GetNumberOfTimeBins(); // number of time bins read from data - fNumberClustersf = fTimeMax; - fNumberClusters = (Int_t)(fNumberClustersProcent*fTimeMax); - Int_t *signal = rawStream->GetSignals(); // current ADC signal - Int_t col = rawStream->GetCol(); - Int_t row = rawStream->GetRow(); - - - //printf("detector %d, signal[0] %d, signal[1] %d, signal[2] %d, baseline %d\n",idetector,signal[0],signal[1],signal[2], baseline); - - for(Int_t itime = 0; itime < fTimeMax; itime++){ - phvalue[row][col][itime] = signal[itime]-baseline; - /*if(phvalue[row][col][itime] >= 20) { - printf("----------> phvalue[%d][%d][%d] %d baseline %d \n", - row, - col, - itime, - signal[itime], - baseline); - }*/ - } - } - - // fill the last one - if(fDetectorPreviousTrack != -1){ - - // Fill - withInput = TMath::Max(FillDAQ(phvalue),withInput); - - // reset - for(Int_t k = 0; k < 36; k++){ - for(Int_t j = 0; j < 16; j++){ - for(Int_t c = 0; c < 144; c++){ - phvalue[j][c][k] = 0.0; - } - } - } - } - } - - return withInput; - -} -//_____________________________________________________________________ -Int_t AliTRDCalibraFillHisto::ProcessEventDAQ(AliRawReader *rawReader, Bool_t nocheck) -{ - // - // Event processing loop - AliRawReader - // Testbeam 2007 version - // - - AliTRDrawStreamBase rawStream(rawReader); - - rawReader->Select("TRD"); - - return ProcessEventDAQ(&rawStream, nocheck); -} - -//_________________________________________________________________________ -Int_t AliTRDCalibraFillHisto::ProcessEventDAQ( -#ifdef ALI_DATE - const eventHeaderStruct *event, - Bool_t nocheck -#else - const eventHeaderStruct* /*event*/, - Bool_t /*nocheck*/ - -#endif - ) -{ - // - // process date event - // Testbeam 2007 version - // -#ifdef ALI_DATE - AliRawReader *rawReader = new AliRawReaderDate((void*)event); - Int_t result=ProcessEventDAQ(rawReader, nocheck); - delete rawReader; - return result; -#else - Fatal("AliTRDCalibraFillHisto", "this class was compiled without DATE"); - return 0; -#endif - -} -//_____________________________________________________________________ -Int_t AliTRDCalibraFillHisto::ProcessEventDAQ2(AliRawReader *rawReader) +Int_t AliTRDCalibraFillHisto::ProcessEventDAQ(AliRawReader *rawReader) { //main // - // Event Processing loop - AliTRDrawFastStream + // Event Processing loop - AliTRDrawStream // // 0 timebin problem // 1 no input @@ -2559,10 +1971,7 @@ Int_t AliTRDCalibraFillHisto::ProcessEventDAQ2(AliRawReader *rawReader) // Same algorithm as TestBeam but different reader // - // AliTRDrawFastStream *rawStream = AliTRDrawFastStream::GetRawStream(rawReader); - AliTRDrawFastStream *rawStream = new AliTRDrawFastStream(rawReader); - rawStream->SetNoErrorWarning(); - rawStream->SetSharedPadReadout(kFALSE); + AliTRDrawStream *rawStream = new AliTRDrawStream(rawReader); AliTRDdigitsManager *digitsManager = new AliTRDdigitsManager(kTRUE); digitsManager->CreateArrays(); @@ -2635,8 +2044,8 @@ Int_t AliTRDCalibraFillHisto::ProcessEventDAQ2(AliRawReader *rawReader) // nbtimebin = rawStream->GetNumberOfTimeBins(); // number of time bins read from data AliTRDdigitsParam *digitParam = (AliTRDdigitsParam *)digitsManager->GetDigitsParam(); - nbtimebin = digitParam->GetNTimeBins(); // number of time bins read from data - baseline = digitParam->GetADCbaseline(); // baseline + nbtimebin = digitParam->GetNTimeBins(det); // number of time bins read from data + baseline = digitParam->GetADCbaseline(det); // baseline if(nbtimebin == 0) return 0; if((fTimeMax != 0) && (nbtimebin != fTimeMax)) return 0; @@ -3003,20 +2412,15 @@ Double_t *AliTRDCalibraFillHisto::StatH(TH2 *h, Int_t i) //Debug if(i > 1){ - if((!((Bool_t)nbEntries)) && (nentries > 0)){ - nbEntries = new TH1F("Number of entries","Number of entries" - ,100,(Int_t)nentries/2,nentries*2); + if(nentries > 0){ + if(!((Bool_t)nbEntries)) nbEntries = new TH1F("Number of entries","Number of entries",100,(Int_t)nentries/2,nentries*2); nbEntries->SetDirectory(0); - nbEntriesPerGroup = new TH1F("Number of entries per group","Number of entries per group" - ,nbins,0,nbins); + nbEntries->Fill(nentries); + if(!((Bool_t)nbEntriesPerGroup)) nbEntriesPerGroup = new TH1F("Number of entries per group","Number of entries per group",nbins,0,nbins); nbEntriesPerGroup->SetDirectory(0); - nbEntriesPerSp = new TProfile("Number of entries per supermodule","Number of entries per supermodule" - ,(Int_t)(nbins/18),0,(Int_t)(nbins/18)); - nbEntriesPerSp->SetDirectory(0); - } - if(nbEntries){ - if(nentries > 0) nbEntries->Fill(nentries); nbEntriesPerGroup->Fill(idect+0.5,nentries); + if(!((Bool_t)nbEntriesPerSp)) nbEntriesPerSp = new TProfile("Number of entries per supermodule","Number of entries per supermodule",(Int_t)(nbins/18),0,(Int_t)(nbins/18)); + nbEntriesPerSp->SetDirectory(0); nbEntriesPerSp->Fill((idect%((Int_t)(nbins/18)))+0.5,nentries); } } @@ -3057,7 +2461,7 @@ Double_t *AliTRDCalibraFillHisto::StatH(TH2 *h, Int_t i) info[5] = meanstats; info[6] = meanrelativerror; - if(i > 1){ + if(nbEntries && nbEntriesPerSp && nbEntriesPerGroup){ gStyle->SetPalette(1); gStyle->SetOptStat(1111); gStyle->SetPadBorderMode(0); @@ -3091,12 +2495,13 @@ Double_t *AliTRDCalibraFillHisto::GetMeanMedianRMSNumberCH() // 3 number of group with entries // - Double_t *stat = new Double_t[4]; + Double_t *stat = new Double_t[4]; stat[3] = 0.0; Int_t nbofgroups = CalculateTotalNumberOfBins(0); - Double_t *weight = new Double_t[nbofgroups]; - Int_t *nonul = new Int_t[nbofgroups]; + + Double_t *weight = new Double_t[nbofgroups]; + Double_t *nonul = new Double_t[nbofgroups]; for(Int_t k = 0; k < nbofgroups; k++){ if(fEntriesCH[k] > 0) { @@ -3110,6 +2515,9 @@ Double_t *AliTRDCalibraFillHisto::GetMeanMedianRMSNumberCH() stat[1] = TMath::Median(nbofgroups,fEntriesCH,weight); stat[2] = TMath::RMS((Int_t)stat[3],nonul); + delete [] weight; + delete [] nonul; + return stat; } @@ -3143,6 +2551,9 @@ Double_t *AliTRDCalibraFillHisto::GetMeanMedianRMSNumberLinearFitter() const stat[1] = TMath::Median(nbofgroups,fEntriesLinearFitter,weight); stat[2] = TMath::RMS((Int_t)stat[3],nonul); + delete [] weight; + delete [] nonul; + return stat; } @@ -3191,7 +2602,13 @@ void AliTRDCalibraFillHisto::CreatePH2d(Int_t nn) // Create the 2D histos // - TString name("Nz"); + TString name("Ver"); + name += fVersionVdriftUsed; + name += "Subver"; + name += fSubVersionVdriftUsed; + name += "FirstRun"; + name += fFirstRunVdrift; + name += "Nz"; name += fCalibraMode->GetNz(1); name += "Nrphi"; name += fCalibraMode->GetNrphi(1); @@ -3212,11 +2629,17 @@ void AliTRDCalibraFillHisto::CreateCH2d(Int_t nn) // Create the 2D histos // - TString name("Nz"); + TString name("Ver"); + name += fVersionGainUsed; + name += "Subver"; + name += fSubVersionGainUsed; + name += "FirstRun"; + name += fFirstRunGain; + name += "Nz"; name += fCalibraMode->GetNz(0); name += "Nrphi"; name += fCalibraMode->GetNrphi(0); - + fCH2d = new TH2I("CH2d",(const Char_t *) name ,fNumberBinCharge,0,300,nn,0,nn); fCH2d->SetYTitle("Det/pad groups"); @@ -3376,17 +2799,23 @@ void AliTRDCalibraFillHisto::AnalyseLinearFitter() TVectorD *par = new TVectorD(2); TVectorD pare = TVectorD(2); TVectorD *parE = new TVectorD(3); - linearfitter->Eval(); - linearfitter->GetParameters(*par); - linearfitter->GetErrors(pare); - Float_t ppointError = TMath::Sqrt(TMath::Abs(linearfitter->GetChisquare())/fEntriesLinearFitter[k]); - (*parE)[0] = pare[0]*ppointError; - (*parE)[1] = pare[1]*ppointError; - (*parE)[2] = (Double_t) fEntriesLinearFitter[k]; - ((TObjArray *)fLinearVdriftFit->GetPArray())->AddAt(par,k); - ((TObjArray *)fLinearVdriftFit->GetEArray())->AddAt(parE,k); + if((linearfitter->EvalRobust(0.8)==0)) { + //linearfitter->Eval(); + linearfitter->GetParameters(*par); + //linearfitter->GetErrors(pare); + //Float_t ppointError = TMath::Sqrt(TMath::Abs(linearfitter->GetChisquare())/fEntriesLinearFitter[k]); + //(*parE)[0] = pare[0]*ppointError; + //(*parE)[1] = pare[1]*ppointError; + + (*parE)[0] = 0.0; + (*parE)[1] = 0.0; + (*parE)[2] = (Double_t) fEntriesLinearFitter[k]; + ((TObjArray *)fLinearVdriftFit->GetPArray())->AddAt(par,k); + ((TObjArray *)fLinearVdriftFit->GetEArray())->AddAt(parE,k); + } } } } +