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

Ecal Detailed Time Rechits in 810 #15613

Merged
merged 42 commits into from Sep 15, 2016

Conversation

lgray
Copy link
Contributor

@lgray lgray commented Aug 25, 2016

Forward port and modernization of #2703.

Also includes new runTheMatrix workflows for tests, tested with 21224.0 and 22024.0.
New Eras 2023C1_timing and 2023C2_timing.

@pmeridian I checked this in TTbar and the distributions looked OK. Since you are the author of the code could you please take a look in CMSSW_8_1_X?

@bendavid @kpedro88

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @lgray (Lindsey Gray) for CMSSW_8_1_X.

It involves the following packages:

Configuration/Eras
Configuration/PyReleaseValidation
Configuration/StandardSequences
DataFormats/CaloRecHit
DataFormats/EcalDigi
DataFormats/EcalRecHit
RecoLocalCalo/Configuration
RecoLocalCalo/EcalRecProducers
SLHCUpgradeSimulations/Configuration
SimCalorimetry/Configuration
SimCalorimetry/EcalSimAlgos
SimCalorimetry/EcalSimProducers
SimG4CMS/Calo
SimG4Core/Configuration
SimGeneral/MixingModule

The following packages do not have a category, yet:

Configuration/Eras

@civanch, @cvuosalo, @franzoni, @mdhildreth, @fabozzi, @cmsbuild, @srimanob, @slava77, @hengne, @davidlange6 can you please review it and eventually sign? Thanks.
@ghellwig, @wmtan, @makortel, @GiacomoSguazzoni, @rovere, @VinInn, @Martin-Grunewald, @argiro, @dgulhan this is something you requested to watch as well.
@slava77, @smuzaffar you are the release manager for this.

cms-bot commands are list here #13028

@lgray
Copy link
Contributor Author

lgray commented Aug 25, 2016

Had to rebase, need to double check before launching matrix tests here.

@lgray
Copy link
Contributor Author

lgray commented Aug 26, 2016

@cmsbuild please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Aug 26, 2016

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/14745/console

@cmsbuild
Copy link
Contributor

-1

Tested at: 0b38b6a

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

I found follow errors while testing this PR

Failed tests: RelVals

  • RelVals:

When I ran the RelVals I found an error in the following worklfows:
4.22 step1

DAS Error

@lgray
Copy link
Contributor Author

lgray commented Aug 26, 2016

@cmsbuild please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Aug 26, 2016

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/14746/console

@cmsbuild
Copy link
Contributor

from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM
from Configuration.Eras.Modifier_phase2_timing_cff import phase2_timing

Phase2C1_timing = cms.ModifierChain(run2_common, phase2_common, phase2_tracker, trackingPhase2PU140, phase2_muon, run3_GEM, phase2_timing)
Copy link
Contributor

Choose a reason for hiding this comment

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

If the point is to be Phase2C1 + phase2_timing always, how about Phase2C1 = cms.ModifierChain(Phase2C1, phase2_timing)? Then all future changes to Phase2C1 would be automatically included here.

(same comment for Phase2C2_timing below)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Indeed, and done. Running local tests first to make sure everything is OK.

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

Pull request #15613 was updated. @civanch, @cvuosalo, @franzoni, @mdhildreth, @fabozzi, @cmsbuild, @srimanob, @slava77, @hengne, @davidlange6 can you please check and sign again.

@cmsbuild
Copy link
Contributor

Pull request #15613 was updated. @civanch, @cvuosalo, @franzoni, @mdhildreth, @fabozzi, @cmsbuild, @srimanob, @slava77, @hengne, @davidlange6 can you please check and sign again.

@lgray
Copy link
Contributor Author

lgray commented Sep 14, 2016

@cmsbuild please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 14, 2016

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/15138/console

@lgray
Copy link
Contributor Author

lgray commented Sep 14, 2016

@cvuosalo I'll put in the python pipework for these last commits in another PR once this is in an IB.

I am done adding things to this PR.

@lgray
Copy link
Contributor Author

lgray commented Sep 14, 2016

@cvuosalo Note: if you add #15835 on top of this PR the timing degradations from turning on the ECAL Detailed Time vanish. The additional memory usage stays.

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

@civanch
Copy link
Contributor

civanch commented Sep 15, 2016

+1

std::vector<std::pair<float,DetId> > smeared_times;
resolutions.reserve(clusters.size());
smeared_times.reserve(clusters.size());
std::auto_ptr<std::vector< std::vector<float> > > outP( new std::vector< std::vector<float> > );
Copy link
Contributor

Choose a reason for hiding this comment

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

auto_ptr is deprecated. Please change to unique_ptr/shared_ptr. Same for line 73.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Would it be possible to address this in the next PR where this code is introduced into the reconstruction workflows? Unless there are other major comments.

Copy link
Contributor

Choose a reason for hiding this comment

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

Yes, these minor issues could be fixed in a later PR.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@cvuosalo These are fixed by @wmtan. Thanks! Consider this comment addressed.

float correctTimeToVertex(const float intime, const DetId& timeDet, const reco::Vertex& vtx,
const CaloSubdetectorGeometry* ecalGeom) const;
// RNG
CLHEP::HepRandomEngine* _rng_engine;
Copy link
Contributor

Choose a reason for hiding this comment

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

Leading underbar is not allowed in a variable name: _rng_engine.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Umm this is not the version of the file in that's in git and tested, you are looking at a previous revision. Please double check.

Copy link
Contributor

Choose a reason for hiding this comment

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

OK, sorry. It's already fixed.

@cvuosalo
Copy link
Contributor

@lgray: Does the PR description need revision? I don't think 11624.0 and 12024.0 are 2023 workflows anymore.

@lgray
Copy link
Contributor Author

lgray commented Sep 15, 2016

workflow numbers are updated!

@cvuosalo
Copy link
Contributor

+1

For #15613 369440a

For Phase 2, adding a detailed simulation of a timing layer in the ECAL.

The code changes are satisfactory, and Jenkins tests against baseline CMSSW_8_1_X_2016-09-14-1100 show no significant differences. Extensive timing tests are discussed at length above, with the conclusion that fixes in other current or upcoming PRs will address the issues.

@lgray
Copy link
Contributor Author

lgray commented Sep 15, 2016

@davidlange6 If possible it would be nice to get this in tonight's IB. I'd like to rebase the vertex timing PR to this one without recompiling 500 packages.

@davidlange6 davidlange6 merged commit 86088d6 into cms-sw:CMSSW_8_1_X Sep 15, 2016

#standard PU sequences
upgradeProperties[2023]['2017PU'] = deepcopy(upgradeProperties[2017]['2017'])
upgradeProperties[2023]['2017PU']['ScenToRun'] = ['GenSimFull','DigiFullPU','RecoFullPU','HARVESTFullPU']
Copy link
Contributor

Choose a reason for hiding this comment

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

I belive there is a typo here (2013 instead of 2017 ) @kpedro88 @lgray

Copy link
Contributor

Choose a reason for hiding this comment

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

Yeah, this looks like a rebase mistake - the real 2017PU workflows are defined further up. @lgray, can you fix this in your followup PR? (or @boudoul, if you're rebasing your PR onto this anyway, feel free to fix it there...)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Indeed, I'll patch it in #15710

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Actually, making a separate patch PR.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed in #15870

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.

None yet