@@ -105,6 +105,7 @@ class SiPixelCompareTracks : public DQMEDAnalyzer {
105105 MonitorElement* hChi2VsPhi_;
106106 MonitorElement* hChi2VsEta_;
107107 MonitorElement* hpt_;
108+ MonitorElement* hCurvature_;
108109 MonitorElement* hptLogLog_;
109110 MonitorElement* heta_;
110111 MonitorElement* hphi_;
@@ -200,6 +201,7 @@ void SiPixelCompareTracks<T>::analyzeSeparate(U tokenRef, V tokenTar, const edm:
200201 float phiRef = reco::phi (tsoaRef.view (), it);
201202 float zipRef = reco::zip (tsoaRef.view (), it);
202203 float tipRef = reco::tip (tsoaRef.view (), it);
204+ auto qRef = reco::charge (tsoaRef.view (), it);
203205
204206 if (!(ptRef > 0 .))
205207 continue ;
@@ -231,17 +233,18 @@ void SiPixelCompareTracks<T>::analyzeSeparate(U tokenRef, V tokenTar, const edm:
231233 nLooseAndAboveTracksRef_matchedTar++;
232234
233235 hchi2_->Fill (tsoaRef.view ()[it].chi2 (), tsoaTar.view ()[closestTkidx].chi2 ());
234- hCharge_->Fill (reco::charge (tsoaRef. view (), it) , reco::charge (tsoaTar.view (), closestTkidx));
236+ hCharge_->Fill (qRef , reco::charge (tsoaTar.view (), closestTkidx));
235237 hnHits_->Fill (helper::nHits (tsoaRef.view (), it), helper::nHits (tsoaTar.view (), closestTkidx));
236238 hnLayers_->Fill (tsoaRef.view ()[it].nLayers (), tsoaTar.view ()[closestTkidx].nLayers ());
237239 hpt_->Fill (ptRef, tsoaTar.view ()[closestTkidx].pt ());
240+ hCurvature_->Fill (qRef / ptRef, reco::charge (tsoaTar.view (), closestTkidx) / tsoaTar.view ()[closestTkidx].pt ());
238241 hptLogLog_->Fill (ptRef, tsoaTar.view ()[closestTkidx].pt ());
239242 heta_->Fill (etaRef, tsoaTar.view ()[closestTkidx].eta ());
240243 hphi_->Fill (phiRef, reco::phi (tsoaTar.view (), closestTkidx));
241244 hz_->Fill (zipRef, reco::zip (tsoaTar.view (), closestTkidx));
242245 htip_->Fill (tipRef, reco::tip (tsoaTar.view (), closestTkidx));
243246 hptdiffMatched_->Fill (ptRef - tsoaTar.view ()[closestTkidx].pt ());
244- hCurvdiffMatched_->Fill (( reco::charge (tsoaRef. view (), it) / tsoaRef. view ()[it]. pt ()) -
247+ hCurvdiffMatched_->Fill (qRef / ptRef -
245248 (reco::charge (tsoaTar.view (), closestTkidx) / tsoaTar.view ()[closestTkidx].pt ()));
246249 hetadiffMatched_->Fill (etaRef - tsoaTar.view ()[closestTkidx].eta ());
247250 hphidiffMatched_->Fill (reco::deltaPhi (phiRef, reco::phi (tsoaTar.view (), closestTkidx)));
@@ -296,18 +299,20 @@ void SiPixelCompareTracks<T>::bookHistograms(DQMStore::IBooker& iBook,
296299 hCharge_ = iBook.book2I (" charge" ,fmt::sprintf (" %s;Reference;Target" ,toRep),3 , -1.5 , 1.5 , 3 , -1.5 , 1.5 );
297300
298301 hpt_ = iBook.book2I (" pt" , " Track (quality #geq loose) p_{T} [GeV];Reference;Target" , 200 , 0 ., 200 ., 200 , 0 ., 200 .);
302+ hCurvature_ = iBook.book2I (" curvature" , " Track (quality #geq loose) q/p_{T} [GeV^{-1}];Reference;Target" , 60 ,- 30 , 30 ., 60 , -30 , 30 );
299303 hptLogLog_ = make2DIfLog (iBook, true , true , " ptLogLog" , " Track (quality #geq loose) p_{T} [GeV];Reference;Target" , 200 , log10 (0.5 ), log10 (200 .), 200 , log10 (0.5 ), log10 (200 .));
300304 heta_ = iBook.book2I (" eta" , " Track (quality #geq loose) #eta;Reference;Target" , 30 , -3 ., 3 ., 30 , -3 ., 3 .);
301305 hphi_ = iBook.book2I (" phi" , " Track (quality #geq loose) #phi;Reference;Target" , 30 , -M_PI, M_PI, 30 , -M_PI, M_PI);
302306 hz_ = iBook.book2I (" z" , " Track (quality #geq loose) z [cm];Reference;Target" , 30 , -30 ., 30 ., 30 , -30 ., 30 .);
303307 htip_ = iBook.book2I (" tip" , " Track (quality #geq loose) TIP [cm];Reference;Target" , 100 , -0.5 , 0.5 , 100 , -0.5 , 0.5 );
308+
304309 // 1D difference plots
305- hptdiffMatched_ = iBook.book1D (" ptdiffmatched" , " p_{T} diff [GeV] between matched tracks; #Delta p_{T} [GeV]" , 60 , -30 ., 30 .);
306- hCurvdiffMatched_ = iBook.book1D (" curvdiffmatched" , " q/p_{T} diff [GeV] between matched tracks; #Delta q/p_{T} [GeV]" , 60 , -30 ., 30 .);
307- hetadiffMatched_ = iBook.book1D (" etadiffmatched" , " #eta diff between matched tracks; #Delta #eta" , 160 , -0.04 ,0.04 );
308- hphidiffMatched_ = iBook.book1D (" phidiffmatched" , " #phi diff between matched tracks; #Delta #phi" , 160 , -0.04 ,0.04 );
309- hzdiffMatched_ = iBook.book1D (" zdiffmatched" , " z diff between matched tracks; #Delta z [cm]" , 300 , -1.5 , 1.5 );
310- htipdiffMatched_ = iBook.book1D (" tipdiffmatched" , " TIP diff between matched tracks; #Delta TIP [cm]" , 300 , -1.5 , 1.5 );
310+ hptdiffMatched_ = iBook.book1D (" ptdiffmatched" , " p_{T} diff [GeV] between matched tracks; #Delta p_{T} [GeV]" , 61 , -30.5 , 30.5 );
311+ hCurvdiffMatched_ = iBook.book1D (" curvdiffmatched" , " q/p_{T} diff [GeV] between matched tracks; #Delta q/p_{T} [GeV]" , 61 , -30.5 , 30.5 );
312+ hetadiffMatched_ = iBook.book1D (" etadiffmatched" , " #eta diff between matched tracks; #Delta #eta" , 161 , -0.045 ,0.045 );
313+ hphidiffMatched_ = iBook.book1D (" phidiffmatched" , " #phi diff between matched tracks; #Delta #phi" , 161 , -0.045 ,0.045 );
314+ hzdiffMatched_ = iBook.book1D (" zdiffmatched" , " z diff between matched tracks; #Delta z [cm]" , 301 , -1.55 , 1.55 );
315+ htipdiffMatched_ = iBook.book1D (" tipdiffmatched" , " TIP diff between matched tracks; #Delta TIP [cm]" , 301 , -1.55 , 1.55 );
311316 // 2D plots for eff
312317 hpt_eta_tkAllRef_ = iBook.book2I (" ptetatrkAllReference" , " Track (quality #geq loose) on Reference; #eta; p_{T} [GeV];" , 30 , -M_PI, M_PI, 200 , 0 ., 200 .);
313318 hpt_eta_tkAllRefMatched_ = iBook.book2I (" ptetatrkAllReferencematched" , " Track (quality #geq loose) on Reference matched to Target track; #eta; p_{T} [GeV];" , 30 , -M_PI, M_PI, 200 , 0 ., 200 .);
@@ -326,7 +331,7 @@ void SiPixelCompareTracks<T>::fillDescriptions(edm::ConfigurationDescriptions& d
326331 desc.add <std::string>(" topFolderName" , " SiPixelHeterogeneous/PixelTrackCompareDeviceVSHost" );
327332 desc.add <bool >(" useQualityCut" , true );
328333 desc.add <std::string>(" minQuality" , " loose" );
329- desc.add <double >(" deltaR2cut" , 0.04 );
334+ desc.add <double >(" deltaR2cut" , 0.02 * 0.02 )-> setComment ( " deltaR2 cut between track on device and host " );
330335 descriptions.addWithDefaultLabel (desc);
331336}
332337
0 commit comments