Sensitive detectors 6 and watchers cleanup #23595

civanch · 2018-06-15T11:12:54Z

This PR includes pure technical clean-up of SIM packages:

MC truth related classes moved from SimG4Core/Application to SimG4Core/Notification
Corresponding dependences and headers in SimG4CMS and SimG4Core updated
Protection for usage of watchers is removed allowing watchers to be used in MT mode
Const pointers to Geant4 objects are used where possible
unused or empty methods removed
empty and commented lines removed

Correctness of this PR means no difference versus baseline.

cmsbuild · 2018-06-15T11:13:13Z

The code-checks are being triggered in jenkins.

civanch · 2018-06-15T11:14:08Z

PR is not yet fully completed but the test will be started in order to see is something is forgotten.

civanch · 2018-06-15T11:15:35Z

please test

cmsbuild · 2018-06-15T11:18:09Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-23595/5197

cmsbuild · 2018-06-15T11:18:27Z

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/28709/console Started: 2018/06/15 15:10

cmsbuild · 2018-06-15T11:18:29Z

A new Pull Request was created by @civanch (Vladimir Ivantchenko) for master.

It involves the following packages:

SimG4CMS/Calo
SimG4CMS/FP420
SimG4CMS/Forward
SimG4CMS/Muon
SimG4CMS/ShowerLibraryProducer
SimG4CMS/Tracker
SimG4Core/Application
SimG4Core/GeometryProducer
SimG4Core/Notification

@cmsbuild, @civanch, @mdhildreth can you please review it and eventually sign? Thanks.
@makortel this is something you requested to watch as well.
@davidlange6, @slava77, @fabiocos you are the release manager for this.

cms-bot commands are listed here

makortel · 2018-06-15T11:28:35Z

@civanch

Protection for usage of watchers is removed allowing watchers to be used in MT mode

Have the watchers been made thread safe? Or is the point to be able to run those which are thread safe, and leave the thread-safeness of watchers as the problem of the one who wants to run them?

civanch · 2018-06-15T12:55:40Z

@makortel , we have discussed at SIM meeting mainly with Sunanda, that we will update all watchers to be thread safe. A good part of old watchers are not revocable for MT but not all of them are used now, I have in mind removing them. We need removing the protection because in exotica sector there is a use case where watcher is needed for this production. First we restore exotica case, then will recover other useful watchers.

cmsbuild · 2018-06-15T13:22:54Z

-1

Tested at: 9dc586d

You can see the results of the tests here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-23595/28709/summary.html

I found follow errors while testing this PR

Failed tests: Build

Build:

I found an error when building:

>> Entering Package SimG4Core/Application
Entering library rule at SimG4Core/Application
>> Compiling  /build/cmsbld/jenkins/workspace/ib-any-integration/CMSSW_10_2_X_2018-06-15-1100/src/SimG4Core/Application/src/SteppingAction.cc 
In file included from /build/cmsbld/jenkins/workspace/ib-any-integration/CMSSW_10_2_X_2018-06-15-1100/src/SimG4Core/Application/interface/EventAction.h:6:0,
                 from /build/cmsbld/jenkins/workspace/ib-any-integration/CMSSW_10_2_X_2018-06-15-1100/src/SimG4Core/Application/src/SteppingAction.cc:3:
/build/cmsbld/jenkins/workspace/ib-any-integration/CMSSW_10_2_X_2018-06-15-1100/poison/SimG4Core/Application/interface/G4SimEvent.h:1:2: error: #error THIS FILE HAS BEEN REMOVED FROM THE PACKAGE.
 #error THIS FILE HAS BEEN REMOVED FROM THE PACKAGE.
  ^~~~~
>> Compiling  /build/cmsbld/jenkins/workspace/ib-any-integration/CMSSW_10_2_X_2018-06-15-1100/src/SimG4Core/Application/src/ExceptionHandler.cc 
In file included from /build/cmsbld/jenkins/workspace/ib-any-integration/CMSSW_10_2_X_2018-06-15-1100/src/SimG4Core/Application/interface/EventAction.h:6:0,
                 from /build/cmsbld/jenkins/workspace/ib-any-integration/CMSSW_10_2_X_2018-06-15-1100/src/SimG4Core/Application/src/SteppingAction.cc:3:

cmsbuild · 2018-06-15T13:22:56Z

Comparison not run due to Build errors (RelVals and Igprof tests were also skipped)

cmsbuild · 2018-06-16T18:42:05Z

The code-checks are being triggered in jenkins.

civanch · 2018-06-16T18:42:43Z

please test

cmsbuild · 2018-06-16T19:11:27Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-23595/5215

cmsbuild · 2018-06-16T19:11:50Z

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/28724/console Started: 2018/06/16 21:16

cmsbuild · 2018-06-16T19:11:51Z

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

cmsbuild · 2018-06-16T22:07:52Z

+1
Tested at: 2c4c4b6
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-23595/28724/summary.html

cmsbuild · 2018-06-16T22:07:55Z

Comparison job queued.

cmsbuild · 2018-06-16T23:51:34Z

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

Comparison Summary:

No significant changes to the logs found
Reco comparison results: 12 differences found in the comparisons
DQMHistoTests: Total files compared: 31
DQMHistoTests: Total histograms compared: 2902004
DQMHistoTests: Total failures: 1
DQMHistoTests: Total nulls: 0
DQMHistoTests: Total successes: 2901813
DQMHistoTests: Total skipped: 190
DQMHistoTests: Total Missing objects: 0
DQMHistoSizes: Histogram memory added: 0.0 KiB( 30 files compared)
Checked 128 log files, 14 edm output root files, 31 DQM output files

civanch · 2018-06-17T08:48:48Z

+1

cmsbuild · 2018-06-17T08:49:10Z

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 will now be reviewed by the release team before it's merged. @davidlange6, @slava77, @smuzaffar, @fabiocos (and backports should be raised in the release meeting by the corresponding L2)

fabiocos · 2018-06-17T14:33:08Z

SimG4CMS/Forward/src/ZdcSD.cc


      // define real distances:
-      float d = fabs(tan(th)-tan(thFibDirRad));   
+      float d = std::abs(tan(th)-tan(thFibDirRad));   


sorry, when is this next iteration planned? Not for 10_2_X I assume at this point

fabiocos · 2018-06-17T14:40:34Z

SimG4CMS/Forward/interface/BscG4Hit.h

-  double       hadr;              //EnergyDeposit of HD particles
-  double       theIncidentEnergy; //Energy of the primary particle
-  G4int          theTrackID;        //Identification number of the primary
+  float       elem;              //EnergyDeposit of EM particles


is the move from double to float in this class supposed to leave the result unchanged? A priori I would imagine no. This class is used in the BHM and in the FastTimer/MTD sensitive detectors. The latter are PhaseII detectors for which I doubt we have histograms that could spot differences. Not a big dal but...

@fabiocos , in the SD classes these values are float or int, so the same type should be members of this hit.

fabiocos · 2018-06-18T16:27:28Z

+1

civanch added 5 commits June 15, 2018 11:45

improved dependences between packages

b80049d

improved dependences between packages

74600ca

move files from Application to Notification

1c3a44a

move files from Application to Notification

d2d2121

move files from Application to Notification

9dc586d

cmsbuild added this to the CMSSW_10_2_X milestone Jun 15, 2018

cmsbuild added code-checks-pending comparison-pending orp-pending pending-signatures simulation-pending tests-pending labels Jun 15, 2018

cmsbuild added code-checks-approved and removed code-checks-pending labels Jun 15, 2018

cmsbuild added tests-started and removed tests-pending labels Jun 15, 2018

cmsbuild added comparison-notrun tests-rejected and removed comparison-pending tests-started labels Jun 15, 2018

cleanup time detectors

2c4c4b6

cmsbuild added code-checks-pending and removed code-checks-approved labels Jun 16, 2018

cmsbuild added code-checks-approved and removed code-checks-pending labels Jun 16, 2018

cmsbuild added tests-started and removed tests-pending labels Jun 16, 2018

cmsbuild added tests-approved and removed tests-started labels Jun 16, 2018

cmsbuild added comparison-available and removed comparison-pending labels Jun 16, 2018

cmsbuild added fully-signed simulation-approved and removed pending-signatures simulation-pending labels Jun 17, 2018

fabiocos reviewed Jun 17, 2018

View reviewed changes

cmsbuild added orp-approved and removed orp-pending labels Jun 18, 2018

cmsbuild merged commit 7549462 into cms-sw:master Jun 18, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sensitive detectors 6 and watchers cleanup #23595

Sensitive detectors 6 and watchers cleanup #23595

civanch commented Jun 15, 2018

cmsbuild commented Jun 15, 2018

civanch commented Jun 15, 2018

civanch commented Jun 15, 2018

cmsbuild commented Jun 15, 2018

cmsbuild commented Jun 15, 2018 •

edited

cmsbuild commented Jun 15, 2018

makortel commented Jun 15, 2018

civanch commented Jun 15, 2018

cmsbuild commented Jun 15, 2018

cmsbuild commented Jun 15, 2018

cmsbuild commented Jun 16, 2018

civanch commented Jun 16, 2018

cmsbuild commented Jun 16, 2018

cmsbuild commented Jun 16, 2018 •

edited

cmsbuild commented Jun 16, 2018

cmsbuild commented Jun 16, 2018

cmsbuild commented Jun 16, 2018

cmsbuild commented Jun 16, 2018

civanch commented Jun 17, 2018

cmsbuild commented Jun 17, 2018

fabiocos Jun 17, 2018

fabiocos Jun 17, 2018

civanch Jun 18, 2018

fabiocos commented Jun 18, 2018

Sensitive detectors 6 and watchers cleanup #23595

Sensitive detectors 6 and watchers cleanup #23595

Conversation

civanch commented Jun 15, 2018

cmsbuild commented Jun 15, 2018

civanch commented Jun 15, 2018

civanch commented Jun 15, 2018

cmsbuild commented Jun 15, 2018

cmsbuild commented Jun 15, 2018 • edited

cmsbuild commented Jun 15, 2018

makortel commented Jun 15, 2018

civanch commented Jun 15, 2018

cmsbuild commented Jun 15, 2018

cmsbuild commented Jun 15, 2018

cmsbuild commented Jun 16, 2018

civanch commented Jun 16, 2018

cmsbuild commented Jun 16, 2018

cmsbuild commented Jun 16, 2018 • edited

cmsbuild commented Jun 16, 2018

cmsbuild commented Jun 16, 2018

cmsbuild commented Jun 16, 2018

cmsbuild commented Jun 16, 2018

civanch commented Jun 17, 2018

cmsbuild commented Jun 17, 2018

fabiocos Jun 17, 2018

Choose a reason for hiding this comment

fabiocos Jun 17, 2018

Choose a reason for hiding this comment

civanch Jun 18, 2018

Choose a reason for hiding this comment

fabiocos commented Jun 18, 2018

cmsbuild commented Jun 15, 2018 •

edited

cmsbuild commented Jun 16, 2018 •

edited