Skip to content

Commit 137dc67

Browse files
glegrasglegras
committed
TRD: updates in vdrift and ExB calibration + possibility to use slope in chi2 matching
1 parent a449f99 commit 137dc67

9 files changed

Lines changed: 131 additions & 47 deletions

File tree

‎DataFormats/Detectors/TRD/include/DataFormatsTRD/Constants.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,11 @@ constexpr int TIMEBINS = 30; ///< the number of time bins
7575
constexpr float MAXIMPACTANGLE = 25.f; ///< the maximum impact angle for tracks relative to the TRD detector plane to be considered for vDrift and ExB calibration
7676
constexpr int NBINSANGLEDIFF = 25; ///< the number of bins for the track angle used for the vDrift and ExB calibration based on the tracking
7777
constexpr double VDRIFTDEFAULT = 1.546; ///< default value for vDrift
78-
constexpr double VDRIFTMIN = 0.01; ///< min value for vDrift
79-
constexpr double VDRIFTMAX = 3.0; ///< max value for vDrift
78+
constexpr double VDRIFTMIN = 0.4; ///< min value for vDrift
79+
constexpr double VDRIFTMAX = 2.0; ///< max value for vDrift
8080
constexpr double EXBDEFAULT = 0.0; ///< default value for LorentzAngle
81-
constexpr double EXBMIN = -0.7; ///< min value for LorentzAngle
82-
constexpr double EXBMAX = 0.7; ///< max value for LorentzAngle
81+
constexpr double EXBMIN = -0.4; ///< min value for LorentzAngle
82+
constexpr double EXBMAX = 0.4; ///< max value for LorentzAngle
8383
constexpr int NBINSGAINCALIB = 320; ///< number of bins in the charge (Q0+Q1+Q2) histogram for gain calibration
8484
constexpr float MPVDEDXDEFAULT = 42.; ///< default Most Probable Value of TRD dEdx
8585
constexpr float T0DEFAULT = 1.2; ///< default value for t0

‎Detectors/TRD/calibration/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ For 'o2-calibration-trd-workflow --vDriftAndExB' there are also the following ke
2727

2828
*Hint: You can get information on the meaning of the parameters by running `o2-calibration-trd-workflow --vDriftAndExB -b --help full`*
2929

30-
If you want to run the calibration from a local file with residuals, trdangreshistos.root, you can run:
30+
If you want to run the calibration from a local file with residuals, trdcaliboutput.root, you can run:
3131

32-
o2-calibration-trd-workflow --vDriftAndExB -b --enable-root-input --calib-vdexb-calibration '--tf-per-slot 1' --configKeyValues "TRDCalibParams.minEntriesChamber=100;TRDCalibParams.minEntriesTotal=50000"
32+
o2-calibration-trd-workflow --vDriftAndExB -b --enable-root-input --calib-vdexb-calibration '--tf-per-slot 1' --configKeyValues "TRDCalibParams.minEntriesChamber=100;TRDCalibParams.minEntriesTotal=50000" --trd-calib-infile trdcaliboutput.root
3333

3434
Additionally it is possible to perform the calibrations fit manually per chamber if you have TPC-TRD or ITS-TPC-TRD tracks, you can run:
3535

3636
o2-trd-global-tracking -b --enable-trackbased-calib
3737

38-
This produces `trdangreshistos.root` which holds the residuals of the angles and differences.
38+
This produces `trdcaliboutput.root` which holds the residuals of the angles and differences.
3939
Then run the macro `Detectors/TRD/calibration/macros/manualCalibFit.C`.
4040
This produces a file of similar name with the fitted data and prints out the fit results.
4141
This is equivalent to running:

‎Detectors/TRD/calibration/include/TRDCalibration/CalibratorVdExB.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ class CalibratorVdExB final : public o2::calibration::TimeSlotCalibration<o2::tr
8888
private:
8989
bool mInitDone{false}; ///< flag to avoid creating the TProfiles multiple times
9090
const TRDCalibParams& mParams{TRDCalibParams::Instance()}; ///< reference to calibration parameters
91-
size_t mMinEntriesTotal{mParams.minEntriesChamber}; ///< minimum total number of angular deviations (on average ~3 entries per bin for each TRD chamber)
92-
size_t mMinEntriesChamber{mParams.minEntriesTotal}; ///< minimum number of angular deviations per chamber for accepting refitted value (~3 per bin)
91+
size_t mMinEntriesTotal{mParams.minEntriesTotal}; ///< minimum total number of angular deviations (on average ~3 entries per bin for each TRD chamber)
92+
size_t mMinEntriesChamber{mParams.minEntriesChamber}; ///< minimum number of angular deviations per chamber for accepting refitted value (~3 per bin)
9393
bool mEnableOutput{false}; ///< enable output of calibration fits and tprofiles in a root file instead of the ccdb
9494
std::unique_ptr<TFile> mOutFile{nullptr}; ///< output file
9595
std::unique_ptr<TTree> mOutTree{nullptr}; ///< output tree

‎Detectors/TRD/calibration/macros/manualCalibFit.C‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
// This root macro reads in 'trdangreshistos.root' and
3838
// performs the calibration fits manually as in CalibratorVdExB.cxx
3939
// This can be used for checking if the calibration fits make sense.
40-
void manualCalibFit(int runNumber = 563336, bool usePreCorrFromCCDB = true)
40+
void manualCalibFit(int runNumber = 563335, bool usePreCorrFromCCDB = false)
4141
{
4242
//----------------------------------------------------
4343
// TTree and File
@@ -91,14 +91,14 @@ void manualCalibFit(int runNumber = 563336, bool usePreCorrFromCCDB = true)
9191
std::cout<<iDet<<" "<<calObject->getVdrift(iDet)<<" "<<calObject->getExB(iDet)<<" ";
9292
if (calObject->isGoodExB(iDet)) counter++;
9393
if (iDet%6==5)std::cout<<std::endl;
94-
mFitFunctor.vdPreCorr[iDet] = calObject->getVdriftDefaultAvg(iDet);
95-
mFitFunctor.laPreCorr[iDet] = calObject->getExBDefaultAvg(iDet);
94+
mFitFunctor.vdPreCorr[iDet] = calObject->getVdrift(iDet, true);
95+
mFitFunctor.laPreCorr[iDet] = calObject->getExB(iDet, true);
9696
}
9797
}
9898
std::cout << counter << " good entries in the CCDB " << std::endl;
9999
mFitFunctor.mAnodePlane = 3.35; // don't really care as long as it's not zero, this parameter could be removed
100-
mFitFunctor.lowerBoundAngleFit = 85 * TMath::DegToRad();
101-
mFitFunctor.upperBoundAngleFit = 105 * TMath::DegToRad();
100+
mFitFunctor.lowerBoundAngleFit = 80 * TMath::DegToRad();
101+
mFitFunctor.upperBoundAngleFit = 100 * TMath::DegToRad();
102102
if (!usePreCorrFromCCDB) {
103103
mFitFunctor.vdPreCorr.fill(1.546);
104104
mFitFunctor.laPreCorr.fill(0.0);
@@ -128,6 +128,7 @@ void manualCalibFit(int runNumber = 563336, bool usePreCorrFromCCDB = true)
128128
if (nEntries > 0) { // skip entries which have no entries; ?
129129
// add to the respective profile for fitting later on
130130
mFitFunctor.profiles[iDet]->Fill(2 * iBin - 25.f, angleDiffSum / nEntries, nEntries);
131+
if (iDet == 207) std::cout<<iBin<<" "<<angleDiffSum<<" "<<nEntries<<" "<<angleDiffSum/nEntries<<" "<<mFitFunctor.profiles[iDet]->GetBinEntries(iBin+1)<<" "<<mFitFunctor.profiles[iDet]->GetBinEffectiveEntries(iBin+1)<<" "<<mFitFunctor.profiles[iDet]->GetBinError(iBin+1)<<std::endl;
131132
}
132133
}
133134
printf("Det %d: nEntries=%d \n", iDet, nEntriesDetTotal[iDet]);
@@ -142,6 +143,7 @@ void manualCalibFit(int runNumber = 563336, bool usePreCorrFromCCDB = true)
142143

143144
TH1F* hVd = new TH1F("hVd", "v drift", 150, 0.5, 2.);
144145
TH1F* hLa = new TH1F("hLa", "lorentz angle", 200, -25., 25.);
146+
o2::trd::CalVdriftExB* calObjectOut = new o2::trd::CalVdriftExB();
145147

146148
for (int iDet = 0; iDet < 540; ++iDet) {
147149
if (nEntriesDetTotal[iDet] < 75) continue;
@@ -166,31 +168,28 @@ void manualCalibFit(int runNumber = 563336, bool usePreCorrFromCCDB = true)
166168
auto fitResult = fitter.Result();
167169
laFitResults[iDet] = fitResult.Parameter(0);
168170
vdFitResults[iDet] = fitResult.Parameter(1);
169-
printf("Det %d: la=%.3f +/- %.3f (precorr=:%.3f) \tvd=%.3f +/- %.3f (precorr=:%.3f) \t100*minValue=%f\n", iDet, laFitResults[iDet] * TMath::RadToDeg(), fitResult.LowerError(0) * TMath::RadToDeg(), mFitFunctor.laPreCorr[iDet] * TMath::RadToDeg(), vdFitResults[iDet], fitResult.LowerError(1), mFitFunctor.vdPreCorr[iDet], 100*fitResult.MinFcnValue());
171+
if (fitResult.MinFcnValue() > 0.03) continue;
172+
printf("Det %d: la=%.3f \tvd=%.3f \t100*minValue=%f \tentries=%d\n", iDet, laFitResults[iDet] * TMath::RadToDeg(), vdFitResults[iDet], 100*fitResult.MinFcnValue(), nEntriesDetTotal[iDet]);
170173
hVd->Fill(vdFitResults[iDet]);
171174
hLa->Fill(laFitResults[iDet]* TMath::RadToDeg());
175+
calObjectOut->setVdrift(iDet, vdFitResults[iDet]);
176+
calObjectOut->setExB(iDet, laFitResults[iDet]);
172177
}
173178
printf("-------- Finished fits\n");
174179

175180
std::cout<<"number of chambers with enough entries: "<<hVd->GetEntries()<<std::endl;;
176181
std::cout<<"vdrift mean: "<<hVd->GetMean()<<" sigma: "<<hVd->GetStdDev()<<std::endl;
177182
std::cout<<"lorentz angle mean: "<<hLa->GetMean()<<" sigma: "<<hLa->GetStdDev()<<std::endl;
178-
179-
TCanvas* c = new TCanvas("c", "c", 1200, 700);
180-
c->Divide(2,1);
181-
c->cd(1);
182-
hVd->SetLineColor(kBlue); hVd->SetLineWidth(2);
183-
hVd->Draw();
184-
c->cd(2);
185-
hLa->SetLineColor(kBlue); hLa->SetLineWidth(2);
186-
hLa->Draw();
187-
c->SaveAs("VdExBValues.pdf");
188-
183+
189184

190185
//----------------------------------------------------
191186
// Write
192187
//----------------------------------------------------
193188
std::unique_ptr<TFile> outFilePtr(TFile::Open("manualCalibFit.root", "RECREATE"));
189+
hVd->Write();
190+
hLa->Write();
191+
outFilePtr->WriteObjectAny(calObjectOut, "o2::trd::CalVdriftExB", "calObject");
194192
for (auto& p : mFitFunctor.profiles)
195193
p->Write();
194+
196195
}

‎Detectors/TRD/calibration/src/CalibratorVdExB.cxx‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include "CCDB/BasicCCDBManager.h"
2525
#include "CommonUtils/NameConf.h"
2626
#include "CommonUtils/MemFileHelper.h"
27-
#include "DetectorsBase/Propagator.h"
27+
//#include "DetectorsBase/Propagator.h"
2828
#include <TFile.h>
2929
#include <TTree.h>
3030

@@ -108,15 +108,16 @@ void CalibratorVdExB::initProcessing()
108108

109109
// fit is done in region where ion tails are small, close to lorentz angle
110110
// we want an approximate value of the lorentz angle in order to define better fit boundaries
111-
float bz = o2::base::Propagator::Instance()->getNominalBz();
111+
// TODO: find a way to obtain the magnetic field even in standalone calibration
112+
//float bz = o2::base::Propagator::Instance()->getNominalBz();
112113
// default angle with zero field is slightly shifted
113114
float lorentzAngleAvg = -1.f;
114-
if (TMath::Abs(bz - 2) < 0.1f) { lorentzAngleAvg = 2.f;}
115+
/*if (TMath::Abs(bz - 2) < 0.1f) { lorentzAngleAvg = 2.f;}
115116
if (TMath::Abs(bz + 2) < 0.1f) { lorentzAngleAvg = -4.f;}
116117
if (TMath::Abs(bz - 5) < 0.1f) { lorentzAngleAvg = 7.f;}
117118
if (TMath::Abs(bz + 5) < 0.1f) { lorentzAngleAvg = -9.5f;}
118119
119-
LOGP(info, "b field: {} lorentz angle start: {}", bz, lorentzAngleAvg);
120+
LOGP(info, "b field: {} lorentz angle start: {}", bz, lorentzAngleAvg);*/
120121

121122
mFitFunctor.lowerBoundAngleFit = (80 + lorentzAngleAvg) * TMath::DegToRad();
122123
mFitFunctor.upperBoundAngleFit = (100 + lorentzAngleAvg) * TMath::DegToRad();
@@ -197,7 +198,7 @@ void CalibratorVdExB::finalizeSlot(Slot& slot)
197198
}
198199
// Check if we have the minimum amount of entries
199200
if (sumEntries < mMinEntriesChamber) {
200-
LOGF(debug, "Chamber %d did not reach minimum amount of entries for refit", iDet);
201+
LOGF(debug, "Chamber %d did not reach minimum amount of entries for refit: %d", iDet, sumEntries);
201202
continue;
202203
}
203204
float laPreCorrTemp = mFitFunctor.laPreCorr[iDet];
@@ -211,7 +212,7 @@ void CalibratorVdExB::finalizeSlot(Slot& slot)
211212
mParamsStart[ParamIndex::VD] = 1.0;
212213
mFitter.FitFCN();
213214
auto fitResult = mFitter.Result();
214-
if (fitResult.MinFcnValue() > 0.05) {
215+
if (fitResult.MinFcnValue() > 0.03) {
215216
LOGF(debug, "Chamber %d fit did not converge properly, minimization value too high: %f", iDet, fitResult.MinFcnValue());
216217
// The fit did not work properly, so we keep previous values
217218
mFitFunctor.laPreCorr[iDet] = laPreCorrTemp;
@@ -220,7 +221,7 @@ void CalibratorVdExB::finalizeSlot(Slot& slot)
220221
}
221222
laFitResults[iDet] = fitResult.Parameter(ParamIndex::LA);
222223
vdFitResults[iDet] = fitResult.Parameter(ParamIndex::VD);
223-
LOGF(debug, "Fit result for chamber %i: vd=%f, la=%f", iDet, vdFitResults[iDet], laFitResults[iDet] * TMath::RadToDeg());
224+
LOGF(debug, "Fit result for chamber %i: vd=%f, la=%f, minimizer value=%f", iDet, vdFitResults[iDet], laFitResults[iDet] * TMath::RadToDeg(), fitResult.MinFcnValue());
224225
// Update fit values for next fit
225226
mFitFunctor.laPreCorr[iDet] = laFitResults[iDet];
226227
mFitFunctor.vdPreCorr[iDet] = vdFitResults[iDet];

‎Detectors/TRD/calibration/src/TrackBasedCalib.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ int TrackBasedCalib::doTrdOnlyTrackFits(gsl::span<const TrackTRD>& tracks)
266266
// tracklet angle, corrected for pad tilt
267267
const PadPlane* pad = Geometry::instance()->getPadPlane(mTrackletsRaw[trkltId].getDetector());
268268
float tilt = tan(TMath::DegToRad() * pad->getTiltingAngle()); // tilt is signed! and returned in degrees
269-
float tiltCorrUp = tilt * trkWork.getTgl() * 3;
269+
float tiltCorrUp = tilt * trkWork.getTgl() * Geometry::cdrHght();
270270
float padLength = pad->getRowSize(mTrackletsRaw[trkltId].getPadRow());
271271
if (!((trkWork.getSigmaZ2() < (padLength * padLength / 12.f)) && (std::fabs(mTrackletsCalib[trkltId].getZ() - trkWork.getZ()) < padLength))) {
272272
tiltCorrUp = 0.f;

‎GPU/GPUTracking/Definitions/GPUSettingsList.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ AddOptionRTC(extraRoadZ, float, 10.f, "", 0, "Addition to search road around tra
184184
AddOptionRTC(trkltResRPhiIdeal, float, 1.f, "", 0, "Optimal tracklet rphi resolution in cm (in case phi of track = lorentz angle)")
185185
AddOptionRTC(maxChi2Red, float, 99.f, "", 0, "maximum chi2 per attached tracklet for TRD tracks TODO: currently effectively disabled, requires tuning")
186186
AddOptionRTC(applyDeflectionCut, uint8_t, 0, "", 0, "Set to 1 to enable tracklet selection based on deflection")
187+
AddOptionRTC(addDeflectionInChi2, uint8_t, 0, "", 0, "Set to 1 to add the deflection in the chi2 calculation for matching")
187188
AddOptionRTC(stopTrkAfterNMissLy, uint8_t, 6, "", 0, "Abandon track following after N layers without a TRD match")
188189
AddOptionRTC(nTrackletsMin, uint8_t, 3, "", 0, "Tracks with less attached tracklets are discarded after the tracking")
189190
AddOptionRTC(matCorrType, uint8_t, 2, "", 0, "Material correction to use: 0 - none, 1 - TGeo, 2 - matLUT")

0 commit comments

Comments
 (0)