Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Phase2-hgx119 HGCDigi can work with generic DetId #23690

Merged
merged 2 commits into from
Jul 9, 2018

Conversation

bsunanda
Copy link
Contributor

@bsunanda bsunanda commented Jun 26, 2018

DetId class changed for HGC from HGCal to HGCSilicon and from Hcal to HGCScintillator. Accordingly Digi collection now depends on generic DetId

@cmsbuild
Copy link
Contributor

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @bsunanda for master.

It involves the following packages:

DataFormats/HGCDigi
SimCalorimetry/HGCalSimProducers

@cmsbuild, @civanch, @kpedro88, @mdhildreth can you please review it and eventually sign? Thanks.
@vandreev11, @sethzenz, @makortel, @rovere, @lgray, @cseez, @pfs, @kpedro88 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

@bsunanda
Copy link
Contributor Author

@cmsbuild Please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Jun 26, 2018

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

@bsunanda
Copy link
Contributor Author

@fabiocos This may be the last change to DataFormats

@kpedro88
Copy link
Contributor

@bsunanda I do think this makes more sense in general. But a few questions/comments:

  1. Removing the old definitions prevents us from reading old files.
  2. If the first template parameter of the HGCDataFrame class will always be DetId, it doesn't need to be a template parameter at all.

However, if we keep the old dataframe types defined, we can keep the first template parameter in HGCDataFrame. Then we could just have a new typedef HGCDataFrame<DetId,HGCSample> HGCalDataFrame or something, and use that everywhere in the code from now on.

@bsunanda
Copy link
Contributor Author

@kpedro88 I agree with you. I shall restore the old definitions in classes.h and the xml files. Do I need to change the typedef for DigiCollections? Are Digi's stored as persistent objects?

@kpedro88
Copy link
Contributor

Yes, digis are stored persistently, so it's better not to change the typedefs.

@cmsbuild
Copy link
Contributor

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

@kpedro88
Copy link
Contributor

@bsunanda will you update the digitizer code (HGCDigitizer, HGCDigiProducer, PreMixingHGCalWorker) and local reco code (HGCalUncalibRecHit... classes) to use the new digi collection type for the new geometry?
See f2629c3 and 6a053c5 from when I changed the BH collection in #23545.

@bsunanda
Copy link
Contributor Author

@kpedro88 Could you please take care of them? I am concentrating on geometry issue now

@bsunanda
Copy link
Contributor Author

@cmsbuild Please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Jun 26, 2018

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/28915/console Started: 2018/06/26 23:34

@kpedro88
Copy link
Contributor

@bsunanda okay, I will do it once this is merged.

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

Comparison job queued.

@cmsbuild
Copy link
Contributor

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

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 31
  • DQMHistoTests: Total histograms compared: 2899480
  • DQMHistoTests: Total failures: 1
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2899289
  • 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
Copy link
Contributor

civanch commented Jun 27, 2018

+1

@kpedro88
Copy link
Contributor

+1

@cmsbuild
Copy link
Contributor

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)

@@ -18,22 +24,6 @@ namespace DataFormats_HGCDigi {
std::vector<HGCDataFrame<HcalDetId,HGCSample> > vHGCalBHDataFrames;
edm::SortedCollection< HGCDataFrame<HcalDetId,HGCSample> > scHGCalBHDataFrames;
edm::Wrapper< edm::SortedCollection< HGCDataFrame<HcalDetId,HGCSample> > > prodHGCalBHDataFrames;

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bsunanda @kpedro88 were these DataFormats already used in past productions?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@fabiocos yes, that's why we kept them here.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kpedro88 sorry, I obviously mean the removed ones: anHGCEEDataFrame, anHGCHEDataFrame...

@bsunanda
Copy link
Contributor Author

bsunanda commented Jul 6, 2018 via email

@fabiocos
Copy link
Contributor

fabiocos commented Jul 9, 2018

+1

@cmsbuild cmsbuild merged commit 3d67c71 into cms-sw:master Jul 9, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants