Updating Phase2 Tracker Digitizer validation code #18687

suchandradutta · 2017-05-11T09:20:58Z

Update of Phase2 Tracker Digitizer validation code :

Detector local origin fixed ( Phase2TrackerMonitorDigi )
correct interpretation of ProcessId ( Phase2TrackerValidateDigi )
changes in histogram range and addition of a few new histograms.
Updated BeamTest analysis code

…ctor local origin ( Phase2TrackerMonitorDigi ) , correct interpretation of ProcessId ( Phase2TrackerValidateDigi ) , changes in histogram range and addition of a few new histograms. Updated Beamtest analysis code

cmsbuild · 2017-05-11T09:21:11Z

A new Pull Request was created by @suchandradutta (Suchandra Dutta) for master.

It involves the following packages:

SimTracker/SiPhase2Digitizer

@cmsbuild, @civanch, @mdhildreth, @kpedro88, @davidlange6 can you please review it and eventually sign? Thanks.
@makortel, @sdevissc, @GiacomoSguazzoni, @rovere, @VinInn, @ebrondol, @threus, @dgulhan this is something you requested to watch as well.
@davidlange6 you are the release manager for this.

cms-bot commands are listed here

kpedro88 · 2017-05-11T14:06:33Z

SimTracker/SiPhase2Digitizer/test/Phase2TrackerMonitorDigi.cc

      XYOccupancyMap->Fill(gp.x()*10., gp.y()*10, occupancy);
      RZOccupancyMap->Fill(gp.z()*10., std::hypot(gp.x(),gp.y())*10., occupancy);  
      local_mes.EtaOccupancyProfP->Fill(gp.eta(), occupancy);
+      //      if (layer == 1) std::cout << " Det Id = " << rawid << " Eta " << gp.eta() << " r " << std::hypot(gp.x(),gp.y())*10. << " z " << gp.z()*10. << " Occupancy " << occupancy << std::endl;


Delete commented-out code

kpedro88 · 2017-05-11T14:06:44Z

SimTracker/SiPhase2Digitizer/test/Phase2TrackerMonitorDigi.cc

@@ -339,7 +340,7 @@ void Phase2TrackerMonitorDigi::bookHistograms(DQMStore::IBooker & ibooker,
 					 ParametersOcc.getParameter<double>("xmax"));

  Parameters =  config_.getParameter<edm::ParameterSet>("RZPositionMapH");  
-  std::cout << " booking RZ Position " << " R = " << Parameters.getParameter<double>("ymax") << " Z " << Parameters.getParameter<double>("xmin") << " " << Parameters.getParameter<double>("xmax") << std::endl;
+   std::cout << " booking RZ Position " << " R = " << Parameters.getParameter<double>("ymax") << " Z " << Parameters.getParameter<double>("xmin") << " " << Parameters.getParameter<double>("xmax") << std::endl;


Use MessageLogger, not cout

kpedro88 · 2017-05-11T14:07:40Z

SimTracker/SiPhase2Digitizer/test/Phase2TrackerValidateDigi.cc

+    if (fabs(simTk_eta) < etaCut_ && simTk_pt > ptCut_ ) fillHistogram(SimulatedTrackPhi, SimulatedTrackPhiP, SimulatedTrackPhiS, simTk_phi, simTk_type);
+
+    // initialize
+    for (std::map<unsigned int, DigiMEs>::iterator it = layerMEs.begin(); it != layerMEs.end(); it++) {


Use range-based loop: auto& it : layerMEs

kpedro88 · 2017-05-11T14:07:52Z

SimTracker/SiPhase2Digitizer/test/Phase2TrackerValidateDigi.cc

+
+    int nHitCutoff = 2;
+    if (pixelFlag_) nHitCutoff = 1;
+    for (std::map<unsigned int, DigiMEs>::iterator it = layerMEs.begin(); it != layerMEs.end(); it++) {


use range-based loop

kpedro88 · 2017-05-11T14:08:36Z

SimTracker/SiPhase2Digitizer/test/Phase2TrackerValidateDigi.cc

      unsigned int rawid = (*isim).detUnitId();
      int layer;
      if (pixelFlag_) layer = tTopo->getITPixelLayerNumber(rawid);
      else layer = tTopo->getOTLayerNumber(rawid);
      if (layer < 0) continue;
+
+      //      std::cout << " Layer " << layer << " SimTrack Id " << id << " Type " << simTrk.type() << " Vertex Id " << simTrk.vertIndex() << " Process Type " <<  (*isim).processType() << " Pt " << simTrk.momentum().pt() << std::endl;


Delete commented-out code

kpedro88 · 2017-05-11T14:10:02Z

SimTracker/SiPhase2Digitizer/test/Phase2TrackerValidateDigi.cc

+        else  local_mes.MissedDigiTrackPt->Fill(pt);
+      }
+      if (pt > ptCut_) {
+	//        if (!pixelFlag_ && (std::fabs(eta) > 2.6 || std::fabs(eta) < 0.01) ) std::cout << " Eta " << eta << " Pt " << pt << " layer " << layer << " id " << (*isim).trackId() << " Eloss " << ((*isim).energyLoss()) << " rawid " << rawid << " Event " << iEvent.id().event() << std::endl;


Delete commented-out code

kpedro88 · 2017-05-11T14:10:38Z

SimTracker/SiPhase2Digitizer/test/Phase2TrackerValidateDigi.cc

+	else local_mes.MatchedSimHitElossP->Fill((*isim).energyLoss()/GeVperElectron);
+      } else {
+	local_mes.MissedDigiLocalXposVsYPos->Fill((*isim).localPosition().x(), (*isim).localPosition().y());
+        local_mes.MissedDigiTimeWindow->Fill(std::fabs((*isim).timeOfFlight() - pdPos.mag()/30.));


magic number 30

kpedro88 · 2017-05-11T14:11:18Z

SimTracker/SiPhase2Digitizer/test/Phase2TrackerValidateDigi.cc

+// -- Fill NHit per Layer Histogram
+//
+void Phase2TrackerValidateDigi::fillHitsPerTrack(){
+  for (std::map<unsigned int, DigiMEs>::iterator it = layerMEs.begin(); it != layerMEs.end(); it++) {


use range-based for loop

kpedro88 · 2017-05-11T14:11:56Z

SimTracker/SiPhase2Digitizer/test/TBeamTest.cc

 #include "FWCore/Utilities/interface/InputTag.h"
-
+#include "DQMServices/Core/interface/DQMEDAnalyzer.h"


I'm not sure if a dependence on DQM in SIM/DIGI code is allowed

This is allowed in Validation packages. This code will eventually go there before it gets included in official workflow

"Eventually" is rather vague... if this is validation code, it should go in a validation package.

yes, comes up each PR for this package... Lets get these moved to a proper place..

kpedro88 · 2017-05-11T14:13:30Z

SimTracker/SiPhase2Digitizer/test/TBeamTest.cc

+  types.push_back("PSS_Modules");    
+  ibooker.cd();
+
+  for (std::vector<std::string>::iterator itype = types.begin(); itype != types.end(); itype++) {


use range-based for loop

kpedro88 · 2017-05-11T14:14:40Z

please test

cmsbuild · 2017-05-11T14:14:58Z

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/19759/console Started: 2017/05/11 16:39

cmsbuild · 2017-05-11T15:37:08Z

+1
Tested at: 9c39784
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-18687/19759/summary.html

cmsbuild · 2017-05-11T15:37:12Z

Comparison job queued.

cmsbuild · 2017-05-11T17:18:44Z

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-18687/19759/summary.html

Comparison Summary:

You potentially added 33 lines to the logs
Reco comparison results: 1709 differences found in the comparisons
DQMHistoTests: Total files compared: 24
DQMHistoTests: Total histograms compared: 1830138
DQMHistoTests: Total failures: 23245
DQMHistoTests: Total nulls: 0
DQMHistoTests: Total successes: 1806713
DQMHistoTests: Total skipped: 180
DQMHistoTests: Total Missing objects: 0
Checked 98 log files, 14 edm output root files, 24 DQM output files

cmsbuild · 2017-05-12T13:18:23Z

Pull request #18687 was updated. @cmsbuild, @civanch, @mdhildreth, @kpedro88, @davidlange6 can you please check and sign again.

kpedro88 · 2017-05-12T13:32:51Z

SimTracker/SiPhase2Digitizer/test/Phase2TrackerValidateDigi.cc

+// -- Fill NHit per Layer Histogram
+//
+void Phase2TrackerValidateDigi::fillHitsPerTrack(){
+  for (auto it = layerMEs.begin(); it != layerMEs.end(); it++) {


use range-based for loop, i.e. for (const auto& it : layerMEs)

kpedro88 · 2017-05-12T13:33:59Z

SimTracker/SiPhase2Digitizer/test/Phase2TrackerValidateDigi.cc

@@ -63,12 +64,16 @@ Phase2TrackerValidateDigi::Phase2TrackerValidateDigi(const edm::ParameterSet& iC
  itPixelDigiSimLinkToken_(consumes< edm::DetSetVector<PixelDigiSimLink> >(itPixelDigiSimLinkSrc_)),
  simTrackToken_(consumes< edm::SimTrackContainer >(simTrackSrc_)),
  simVertexToken_(consumes< edm::SimVertexContainer >(simVertexSrc_)),
-  GeVperElectron(3.61E-09) // 1 electron(3.61eV, 1keV(277e, mod 9/06 d.k.
+  GeVperElectron(3.61E-09), // 1 electron(3.61eV, 1keV(277e, mod 9/06 d.k.
+  cval(30.)
 {
  for(auto itag : pSimHitSrc_) simHitTokens_.push_back(consumes< edm::PSimHitContainer >(itag));


While we're here, let's make this const auto&

kpedro88 · 2017-05-12T13:34:44Z

SimTracker/SiPhase2Digitizer/test/TBeamTest.cc

+  types.push_back("PSS_Modules");    
+  ibooker.cd();
+
+  for (auto itype : types) {


use const auto&

cmsbuild · 2017-05-12T14:50:23Z

Pull request #18687 was updated. @cmsbuild, @civanch, @mdhildreth, @kpedro88, @davidlange6 can you please check and sign again.

kpedro88 · 2017-05-12T14:51:20Z

please test

cmsbuild · 2017-05-12T14:51:36Z

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/19792/console Started: 2017/05/12 16:52

cmsbuild · 2017-05-12T15:49:53Z

+1
Tested at: cef7ec3
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-18687/19792/summary.html

cmsbuild · 2017-05-12T15:49:57Z

Comparison job queued.

cmsbuild · 2017-05-12T18:20:56Z

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-18687/19792/summary.html

Comparison Summary:

You potentially added 143 lines to the logs
Reco comparison results: 3333 differences found in the comparisons
DQMHistoTests: Total files compared: 24
DQMHistoTests: Total histograms compared: 1830696
DQMHistoTests: Total failures: 47125
DQMHistoTests: Total nulls: 0
DQMHistoTests: Total successes: 1783391
DQMHistoTests: Total skipped: 180
DQMHistoTests: Total Missing objects: 0
Checked 98 log files, 14 edm output root files, 24 DQM output files

civanch · 2017-05-13T19:06:20Z

+1

kpedro88 · 2017-05-15T14:52:53Z

+1

cmsbuild · 2017-05-15T14:53:11Z

This pull request is fully signed and it will be integrated in one of the next master IBs (tests are also fine). This pull request requires discussion in the ORP meeting before it's merged. @davidlange6, @smuzaffar

davidlange6 · 2017-05-15T16:15:46Z

+1

cmsbuild added this to the CMSSW_9_2_X milestone May 11, 2017

cmsbuild added comparison-pending orp-pending pending-signatures simulation-pending tests-pending upgrade-pending labels May 11, 2017

kpedro88 reviewed May 11, 2017

View reviewed changes

cmsbuild added tests-started and removed tests-pending labels May 11, 2017

cmsbuild added tests-approved and removed tests-started labels May 11, 2017

cmsbuild added comparison-available and removed comparison-pending labels May 11, 2017

clean up of unused couts and using range-based for loop

745c83d

cmsbuild added comparison-pending tests-pending and removed comparison-available tests-approved labels May 12, 2017

kpedro88 reviewed May 12, 2017

View reviewed changes

using range-based for loop

cef7ec3

cmsbuild added tests-started and removed tests-pending labels May 12, 2017

cmsbuild added tests-approved and removed tests-started labels May 12, 2017

cmsbuild added comparison-available and removed comparison-pending labels May 12, 2017

cmsbuild added simulation-approved and removed simulation-pending labels May 13, 2017

cmsbuild added fully-signed upgrade-approved and removed pending-signatures upgrade-pending labels May 15, 2017

cmsbuild added orp-approved and removed orp-pending labels May 15, 2017

cmsbuild merged commit af858f4 into cms-sw:master May 15, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Updating Phase2 Tracker Digitizer validation code #18687

Updating Phase2 Tracker Digitizer validation code #18687

suchandradutta commented May 11, 2017

cmsbuild commented May 11, 2017

kpedro88 May 11, 2017

kpedro88 May 11, 2017

kpedro88 May 11, 2017

kpedro88 May 11, 2017

kpedro88 May 11, 2017

kpedro88 May 11, 2017

kpedro88 May 11, 2017

kpedro88 May 11, 2017

kpedro88 May 11, 2017

suchandradutta May 12, 2017

kpedro88 May 12, 2017

davidlange6 May 15, 2017

kpedro88 May 11, 2017

kpedro88 commented May 11, 2017

cmsbuild commented May 11, 2017 •

edited

cmsbuild commented May 11, 2017

cmsbuild commented May 11, 2017

cmsbuild commented May 11, 2017

cmsbuild commented May 12, 2017

kpedro88 May 12, 2017

kpedro88 May 12, 2017

kpedro88 May 12, 2017

cmsbuild commented May 12, 2017

kpedro88 commented May 12, 2017

cmsbuild commented May 12, 2017 •

edited

cmsbuild commented May 12, 2017

cmsbuild commented May 12, 2017

cmsbuild commented May 12, 2017

civanch commented May 13, 2017

kpedro88 commented May 15, 2017

cmsbuild commented May 15, 2017

davidlange6 commented May 15, 2017

		#include "FWCore/Utilities/interface/InputTag.h"

		#include "DQMServices/Core/interface/DQMEDAnalyzer.h"

Updating Phase2 Tracker Digitizer validation code #18687

Updating Phase2 Tracker Digitizer validation code #18687

Conversation

suchandradutta commented May 11, 2017

cmsbuild commented May 11, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kpedro88 commented May 11, 2017

cmsbuild commented May 11, 2017 • edited

cmsbuild commented May 11, 2017

cmsbuild commented May 11, 2017

cmsbuild commented May 11, 2017

cmsbuild commented May 12, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

cmsbuild commented May 12, 2017

kpedro88 commented May 12, 2017

cmsbuild commented May 12, 2017 • edited

cmsbuild commented May 12, 2017

cmsbuild commented May 12, 2017

cmsbuild commented May 12, 2017

civanch commented May 13, 2017

kpedro88 commented May 15, 2017

cmsbuild commented May 15, 2017

davidlange6 commented May 15, 2017

cmsbuild commented May 11, 2017 •

edited

cmsbuild commented May 12, 2017 •

edited