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

forward port of dataProcessing changes for 25ns #10865

Merged

Conversation

slava77
Copy link
Contributor

@slava77 slava77 commented Aug 19, 2015

Correcting the selection of 25ns vs 50ns for data processing, bringing the release in sync with 74X

This is a cherry pick of

  • changes for data reco processing with 25ns #10518 dc5da96
  • to determine bunch spacing in data in PFClusterEMEnergyCorrector and EcalUncalibRecHitWorkerMultiFit
    • use run 253000 as a maximum with 50 ns if auto-selection is enabled
    • fixup/add manual bunch spacing setting is the auto-selection is disabled
    • in RecoTLR (still using local customs implementation for run2 data processing)
      • add customise_DQM to the common customs (already in 75X/76X)
      • add customiseL1RecoForStage1 for stage1 unpackers and l1extra to use calo stage1
      • add customiseDataRun2Common_25ns (since I couldn't figure out how to more transparently set a default to 25ns and then be able to customize that to 50ns);
      • NB: the customiseDataRun2Common can still be used for Run2015B data processing as suggested in a few HN posts
      • add customiseDataRun2Common_50nsRunsAfter253000 function (it's in the name!) to force 50ns settings for runs after 253000, if we need it
      • remove outdated planBTracking
    • add ppRun2at50ns scenario in T0 processing setup
  • move stage1 only to methods to be used in 2015C data #10574 9510b4f
    • move stage1 only to methods to be used in 2015C data (removed it from RecoTLR.customiseDataRun2Common, which is recommended for 2015A and 2015B reprocessing):
      • customiseDataRun2Common_25ns
      • customiseDataRun2Common_50nsRunsAfter253000
    • added hasattr to modifiers in RecoTLR.customiseDataRun2Common so that it can be used directly at runTheMatrix level
    • also, cleaned up import statements which begin to give warnings in 75X/76X
  • add l1reco hook for stage1 #10509 7e0e8d9
    • adds a new hook for customizing L1Reco to unpack stage 1 from RAW

From 75X tests in CMSSW_7_5_X_2015-08-18-2300:

  • runtests pass (includes parsing of various scenarios in TestConfigDP)
  • compare ppRun2 results for run 251721 (DoubleMuon) and 254231 (JetHT, 25ns fill with 3.8 T, 26 bunches colliding)
    • run 251721 (no diffs expected, except for the L1 calo-related)
      • ==> no changes in reco products
      • L1 plots change (red becomes stage1 inputs; not a default in this run)
        wfdoublemuon251721-l1central_et
    • run 254231 (diffs expected starting from ecal local reco: the baseline uses 50 ns setup in this case and the new version uses the correct 25 ns). The run is 25ns
      • less ecal rechits reconstructed with non-zero energy (as expected) [log(0) = 0 on this plot]
        all_run2at25nsvsorig_jetht254231c_log10ecalrechitssorted_ecalrechit_ecalrechitsee_reco_obj_obj_energy
      • hit timing shows reduced/no contribution from the next 25ns
        wfjetht254231-ebtime
        wfjetht254231-eetime
      • downstream, pf photons rate is smaller (charged hadrons are ~unchanged)
        all_run2at25nsvsorig_jetht254231c_log10recopfcandidates_particleflow__reco_obj_pt40
      • L1 calo plots change (stage1 is now the default)
        wfjetht254231-l1central_et

slava77devel and others added 11 commits August 19, 2015 19:07
…d 25ns and 50ns specific customiseDataRun2Common_25ns and customiseDataRun2Common_50ns; use customiseDataRun2Common_25ns in prompt and express settings; add _50ns versions of Prompt and Express to override things that don't get picked up automatically

Conflicts:
	Configuration/DataProcessing/python/RecoTLR.py
... picking mine
…g anything for 0Tesla or hcal nzs)

Conflicts:
	Configuration/DataProcessing/test/run_CfgTest.sh
... picked mine
…rt statements which begin to give warnings in 75X/76X
@cmsbuild
Copy link
Contributor

A new Pull Request was created by @slava77 (Slava Krutelyov) for CMSSW_7_5_X.

forward port of dataProcessing changes for 25ns

It involves the following packages:

Configuration/DataProcessing
L1Trigger/L1TCommon
RecoLocalCalo/EcalRecProducers
RecoParticleFlow/PFClusterProducer

@cvuosalo, @cmsbuild, @franzoni, @slava77, @mulhearn, @davidlange6 can you please review it and eventually sign? Thanks.
@ghellwig, @mmarionncern, @argiro, @Martin-Grunewald, @lgray, @bachtis this is something you requested to watch as well.
You can sign-off by replying to this message having '+1' in the first line of your reply.
You can reject by replying to this message having '-1' in the first line of your reply.
If you are a L2 or a release manager you can ask for tests by saying 'please test' in the first line of a comment.
@Degano you are the release manager for this.
You can merge this pull request by typing 'merge' in the first line of your comment.

@slava77
Copy link
Contributor Author

slava77 commented Aug 19, 2015

@cmsbuild please test

Also, shart matrix test was run and there are no differences in the considered workflows (run1 data/mc, run2 data)

@cmsbuild
Copy link
Contributor

The tests are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

@slava77
Copy link
Contributor Author

slava77 commented Aug 20, 2015

+1

for #10865 d0b1b60

  • jenkins tests pass; there are no differences in compared workflows because they are not affected by the changes
  • signoff based on pre-PR testing

davidlange6 added a commit that referenced this pull request Aug 20, 2015
…n2at25ns

forward port of dataProcessing changes for 25ns
@davidlange6 davidlange6 merged commit 6ce1f61 into cms-sw:CMSSW_7_5_X Aug 20, 2015
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

5 participants