[PPS] Timing detector preparation for 2021 conditions #30252

forthommel · 2020-06-15T19:30:06Z

PR description:

This PR prepares the ground for future developments in PPS timing detectors offline SW. It includes a new set of DDLs for 2021 scenario (new timing station), with its corresponding cfi-file for testing before integration to on/offline conditions DBs.
The geometry parser is hence modified to "accept seamlessly" this additional station, better exploiting the hierarchy used in geometry definition.

As a side development, the track reconstruction plugin is adapted to dynamically create a track fitting algorithm for each new pot/station observed in the rechits stream (i.e. timing pots are not hardcoded anymore in plugin implementation).
Algorithms being stored as an associative container (single pot detid → algorithm) of this latter, a hash function is defined for the CTPPSDetId object used as an index.

PR validation:

For the new station definition, a simple test can be used (with the new 2021 geometry scenario) to dump all sensors/readout channels positions. No problem observed for the additional station.

For the tracking plugin, ran over 8626 events covering 4 LS of run 319524 (2018C), no difference observed in any of "critical" attributes in track collection.

(black solid line is 11_2_X_2020-06-15-1100, red crosses include this PR)
Matrix tests ongoing.

if this PR is a backport please specify the original PR and why you need to backport that PR: N/A

Before submitting your pull requests, make sure you followed this checklist:

verify that the PR is really intended for the chosen branch
verify that changes follow CMS Naming, Coding, And Style Rules
verify that the PR passes the basic test procedure suggested in the CMSSW PR instructions

cmsbuild · 2020-06-15T19:30:35Z

The code-checks are being triggered in jenkins.

cmsbuild · 2020-06-15T19:37:43Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-30252/16151

This PR adds an extra 72KB to repository

cmsbuild · 2020-06-15T19:38:07Z

A new Pull Request was created by @forthommel (Laurent Forthomme) for master.

It involves the following packages:

DataFormats/CTPPSDetId
Geometry/VeryForwardData
Geometry/VeryForwardGeometry
Geometry/VeryForwardGeometryBuilder
RecoPPS/Local

@perrotta, @civanch, @Dr15Jones, @makortel, @cvuosalo, @ianna, @mdhildreth, @cmsbuild, @slava77 can you please review it and eventually sign? Thanks.
@jan-kaspar, @fabiocos, @rovere this is something you requested to watch as well.
@silviodonato, @dpiparo you are the release manager for this.

cms-bot commands are listed here

forthommel · 2020-06-15T19:40:36Z

@fabferro

cvuosalo · 2020-06-15T20:28:50Z

@forthommel I think we are recommending the change from "CTPPS" to "PPS" for new names, so new files and variables should use "PPS". Existing names with "CTPPS" can be left unchanged.

cvuosalo · 2020-06-15T20:37:36Z

@mundim @forthommel The file CTPPSGeometryESModule.cc in this PR will need to be migrated to DD4hep. What is your plan for migrating this file?

jan-kaspar · 2020-06-15T21:15:14Z

@forthommel I think we are recommending the change from "CTPPS" to "PPS" for new names, so new files and variables should use "PPS". Existing names with "CTPPS" can be left unchanged.

Hi @cvuosalo , I agree, but I can't see where this rule is broken.

jan-kaspar · 2020-06-15T21:17:46Z

@mundim @forthommel The file CTPPSGeometryESModule.cc in this PR will need to be migrated to DD4hep. What is your plan for migrating this file?

Right, @wpcarvalho is working on the DD4Hep migration in parallel, see e.g. https://indico.cern.ch/event/922849/contributions/3877286/attachments/2046061/3427992/PPS_OffSoftMet__2020-05-27.pdf

cvuosalo · 2020-06-15T21:31:55Z

@jan-kaspar For the name change to "PPS", I was thinking of Geometry/VeryForwardData/data/2021/CTPPS_Timing_Stations_Assembly.xml and its contents. But maybe it is considered historical and has to retain the "CTPPS" name for consistency with previous versions of the file.

cvuosalo · 2020-06-15T21:32:08Z

@cmsbuild please test

cmsbuild · 2020-06-15T21:32:15Z

The tests are being triggered in jenkins.

CMSSW_11_2_X_2020-06-15-1100/slc7_amd64_gcc820: https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/7089/console Started: 2020/06/15 23:44

cmsbuild · 2020-06-15T22:43:38Z

-1

Tested at: 01a20d4

CMSSW: CMSSW_11_2_X_2020-06-15-1100
SCRAM_ARCH: slc7_amd64_gcc820
You can see the results of the tests here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-ac5130/7089/summary.html

I found follow errors while testing this PR

Failed tests: RelVals AddOn

RelVals:

When I ran the RelVals I found an error in the following workflows:
136.88811 step2

runTheMatrix-results/136.88811_RunJetHT2018D_reminiaodUL+RunJetHT2018D_reminiaodUL+REMINIAOD_data2018UL+HARVEST2018_REMINIAOD_data2018UL/step2_RunJetHT2018D_reminiaodUL+RunJetHT2018D_reminiaodUL+REMINIAOD_data2018UL+HARVEST2018_REMINIAOD_data2018UL.log

136.731 step3

runTheMatrix-results/136.731_RunSinglePh2016B+RunSinglePh2016B+HLTDR2_2016+RECODR2_2016reHLT_skimSinglePh_HIPM+HARVESTDR2/step3_RunSinglePh2016B+RunSinglePh2016B+HLTDR2_2016+RECODR2_2016reHLT_skimSinglePh_HIPM+HARVESTDR2.log

136.793 step3

runTheMatrix-results/136.793_RunDoubleEG2017C+RunDoubleEG2017C+HLTDR2_2017+RECODR2_2017reHLT_skimDoubleEG_Prompt+HARVEST2017/step3_RunDoubleEG2017C+RunDoubleEG2017C+HLTDR2_2017+RECODR2_2017reHLT_skimDoubleEG_Prompt+HARVEST2017.log

136.874 step3

runTheMatrix-results/136.874_RunEGamma2018C+RunEGamma2018C+HLTDR2_2018+RECODR2_2018reHLT_skimEGamma_Offline_L1TEgDQM+HARVEST2018_L1TEgDQM/step3_RunEGamma2018C+RunEGamma2018C+HLTDR2_2018+RECODR2_2018reHLT_skimEGamma_Offline_L1TEgDQM+HARVEST2018_L1TEgDQM.log

140.56 step2

runTheMatrix-results/140.56_RunHI2018+RunHI2018+RECOHID18+HARVESTDHI18/step2_RunHI2018+RunHI2018+RECOHID18+HARVESTDHI18.log

1306.0 step3

runTheMatrix-results/1306.0_SingleMuPt1_UP15+SingleMuPt1_UP15+DIGIUP15+RECOUP15+HARVESTUP15/step3_SingleMuPt1_UP15+SingleMuPt1_UP15+DIGIUP15+RECOUP15+HARVESTUP15.log

1330.0 step3

runTheMatrix-results/1330.0_ZMM_13+ZMM_13+DIGIUP15+RECOUP15_L1TMuDQM+HARVESTUP15_L1TMuDQM+NANOUP15/step3_ZMM_13+ZMM_13+DIGIUP15+RECOUP15_L1TMuDQM+HARVESTUP15_L1TMuDQM+NANOUP15.log

158.0 step3

runTheMatrix-results/158.0_HydjetQ_B12_5020GeV_2018_ppReco+HydjetQ_B12_5020GeV_2018_ppReco+DIGIHI2018PPRECO+RECOHI2018PPRECO+ALCARECOHI2018PPRECO+HARVESTHI2018PPRECO/step3_HydjetQ_B12_5020GeV_2018_ppReco+HydjetQ_B12_5020GeV_2018_ppReco+DIGIHI2018PPRECO+RECOHI2018PPRECO+ALCARECOHI2018PPRECO+HARVESTHI2018PPRECO.log

10042.0 step3

runTheMatrix-results/10042.0_ZMM_13+ZMM_13TeV_TuneCUETP8M1_2017_GenSimFull+DigiFull_2017+RecoFull_2017+HARVESTFull_2017+ALCAFull_2017+NanoFull_2017/step3_ZMM_13+ZMM_13TeV_TuneCUETP8M1_2017_GenSimFull+DigiFull_2017+RecoFull_2017+HARVESTFull_2017+ALCAFull_2017+NanoFull_2017.log

10024.0 step3

runTheMatrix-results/10024.0_TTbar_13+TTbar_13TeV_TuneCUETP8M1_2017_GenSimFull+DigiFull_2017+RecoFull_2017+HARVESTFull_2017+ALCAFull_2017+NanoFull_2017/step3_TTbar_13+TTbar_13TeV_TuneCUETP8M1_2017_GenSimFull+DigiFull_2017+RecoFull_2017+HARVESTFull_2017+ALCAFull_2017+NanoFull_2017.log

25202.0 step3

runTheMatrix-results/25202.0_TTbar_13+TTbar_13+DIGIUP15_PU25+RECOUP15_PU25+HARVESTUP15_PU25+NANOUP15_PU25/step3_TTbar_13+TTbar_13+DIGIUP15_PU25+RECOUP15_PU25+HARVESTUP15_PU25+NANOUP15_PU25.log

10824.0 step3

runTheMatrix-results/10824.0_TTbar_13+TTbar_13TeV_TuneCUETP8M1_2018_GenSimFull+DigiFull_2018+RecoFull_2018+HARVESTFull_2018+ALCAFull_2018+NanoFull_2018/step3_TTbar_13+TTbar_13TeV_TuneCUETP8M1_2018_GenSimFull+DigiFull_2018+RecoFull_2018+HARVESTFull_2018+ALCAFull_2018+NanoFull_2018.log

10224.0 step3

runTheMatrix-results/10224.0_TTbar_13+TTbar_13TeV_TuneCUETP8M1_2017PU_GenSimFull+DigiFullPU_2017PU+RecoFullPU_2017PU+HARVESTFullPU_2017PU+NanoFull_2017PU/step3_TTbar_13+TTbar_13TeV_TuneCUETP8M1_2017PU_GenSimFull+DigiFullPU_2017PU+RecoFullPU_2017PU+HARVESTFullPU_2017PU+NanoFull_2017PU.log

11634.0 step3

runTheMatrix-results/11634.0_TTbar_14TeV+TTbar_14TeV_TuneCP5_2021_GenSimFull+DigiFull_2021+RecoFull_2021+HARVESTFull_2021+ALCAFull_2021/step3_TTbar_14TeV+TTbar_14TeV_TuneCP5_2021_GenSimFull+DigiFull_2021+RecoFull_2021+HARVESTFull_2021+ALCAFull_2021.log

12434.0 step3

runTheMatrix-results/12434.0_TTbar_14TeV+TTbar_14TeV_TuneCP5_2023_GenSimFull+DigiFull_2023+RecoFull_2023+HARVESTFull_2023+ALCAFull_2023/step3_TTbar_14TeV+TTbar_14TeV_TuneCP5_2023_GenSimFull+DigiFull_2023+RecoFull_2023+HARVESTFull_2023+ALCAFull_2023.log

250202.181 step4

runTheMatrix-results/250202.181_TTbar_13UP18+TTbar_13UP18+PREMIXUP18_PU25+DIGIPRMXLOCALUP18_PU25+RECOPRMXUP18_PU25+HARVESTUP18_PU25/step4_TTbar_13UP18+TTbar_13UP18+PREMIXUP18_PU25+DIGIPRMXLOCALUP18_PU25+RECOPRMXUP18_PU25+HARVESTUP18_PU25.log

AddOn:

I found errors in the following addon tests:

cmsDriver.py RelVal -s HLT:HIon,RAW2DIGI,L1Reco,RECO --data --scenario=pp -n 10 --conditions auto:run3_data_HIon --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --era Run3_pp_on_PbPb --processName=HLTRECO --filein file:RelVal_Raw_HIon_DATA.root --fileout file:RelVal_Raw_HIon_DATA_HLT_RECO.root : FAILED - time: date Tue Jun 16 00:34:06 2020-date Tue Jun 16 00:26:39 2020 s - exit: 16640
cmsDriver.py RelVal -s HLT:2018,RAW2DIGI,L1Reco,RECO --data --scenario=pp -n 10 --conditions auto:run2_data_2018 --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --era Run2_2018 --processName=HLTRECO --filein file:RelVal_Raw_2018_DATA.root --fileout file:RelVal_Raw_2018_DATA_HLT_RECO.root : FAILED - time: date Tue Jun 16 00:38:16 2020-date Tue Jun 16 00:26:47 2020 s - exit: 16640
cmsDriver.py RelVal -s HLT:PIon,RAW2DIGI,L1Reco,RECO --data --scenario=pp -n 10 --conditions auto:run3_data_PIon --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --era Run3 --processName=HLTRECO --filein file:RelVal_Raw_PIon_DATA.root --fileout file:RelVal_Raw_PIon_DATA_HLT_RECO.root : FAILED - time: date Tue Jun 16 00:34:03 2020-date Tue Jun 16 00:26:54 2020 s - exit: 16640
cmsDriver.py RelVal -s HLT:PRef,RAW2DIGI,L1Reco,RECO --data --scenario=pp -n 10 --conditions auto:run3_data_PRef --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --era Run3 --processName=HLTRECO --filein file:RelVal_Raw_PRef_DATA.root --fileout file:RelVal_Raw_PRef_DATA_HLT_RECO.root : FAILED - time: date Tue Jun 16 00:34:04 2020-date Tue Jun 16 00:27:03 2020 s - exit: 16640
cmsDriver.py RelVal -s HLT:GRun,RAW2DIGI,L1Reco,RECO --data --scenario=pp -n 10 --conditions auto:run3_data_GRun --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --era Run3 --processName=HLTRECO --filein file:RelVal_Raw_GRun_DATA.root --fileout file:RelVal_Raw_GRun_DATA_HLT_RECO.root : FAILED - time: date Tue Jun 16 00:40:41 2020-date Tue Jun 16 00:31:23 2020 s - exit: 16640

cmsbuild · 2020-06-15T22:43:40Z

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

cmsbuild · 2020-09-15T14:11:35Z

The code-checks are being triggered in jenkins.

cmsbuild · 2020-09-15T14:18:39Z

-code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-30252/18382

This PR adds an extra 216KB to repository
There are other open Pull requests which might conflict with changes you have proposed:
- File Geometry/VeryForwardGeometry/python/geometryIdealPPSFromDD_2016_cfi.py modified in PR(s): CTPPS Sim and Reco: Change of paradigm: oldDD and DD4hep in parallel #31383
- File Geometry/VeryForwardGeometry/python/geometryIdealPPSFromDD_2017_cfi.py modified in PR(s): CTPPS Sim and Reco: Change of paradigm: oldDD and DD4hep in parallel #31383
- File Geometry/VeryForwardGeometry/python/geometryIdealPPSFromDD_2018_cfi.py modified in PR(s): CTPPS Sim and Reco: Change of paradigm: oldDD and DD4hep in parallel #31383
- File Geometry/VeryForwardGeometryBuilder/plugins/CTPPSGeometryESModule.cc modified in PR(s): CTPPS Sim and Reco: Change of paradigm: oldDD and DD4hep in parallel #31383
- File Validation/CTPPS/plugins/CTPPSDirectProtonSimulation.cc modified in PR(s): CTPPS Sim and Reco: Change of paradigm: oldDD and DD4hep in parallel #31383

Code check has found code style and quality issues which could be resolved by applying following patch(s)

code-checks:
https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-30252/18382/code-checks.patch
e.g. curl https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-30252/18382/code-checks.patch | patch -p1
You can also run scram build code-checks to apply code checks directly

forthommel · 2020-09-15T15:04:08Z

Closing this PR to follow the strategy discussed here and in #31383.
A follow-up PR is to be issued in a short while (and likely when #31383 finally gets merged).

civanch · 2020-09-15T16:26:42Z

@forthommel , @jan-kaspar , sorry for repeated question: two xml files from this PR are essential for Run-3 geometry? If yes, then I would propose, that the next PR will be limited only for Run-3 geometry. The rest may be proposed in a next-next PR. The reason - we need to finalize DB payload.

jan-kaspar · 2020-09-15T16:47:39Z

@forthommel , @jan-kaspar , sorry for repeated question: two xml files from this PR are essential for Run-3 geometry? If yes, then I would propose, that the next PR will be limited only for Run-3 geometry. The rest may be proposed in a next-next PR. The reason - we need to finalize DB payload.

I guess that especially the 2021/v1/Timing_Stations_Assembly.xml would be appreciated since this implements the 2nd timing RP per arm (compared to single timing RP per arm in Run 2).

@ghugo83 can confirm, but her plans are sort of compatible with your suggestion, AFAIK. She already prepared a branch where other modifications (e.g. z sign inversion) are factored out to be deferred to a follow-up PR.

ghugo83 · 2020-09-15T17:00:15Z

Yes the branch is at: https://github.com/ghugo83/cmssw/compare/parallel_oldDD_DD4hep...ghugo83:PPS_2021_rebase?expand=1
It is ready (apart from renaming a boolean, but that takes nearly no time).
Just have to get the PR porting PPS to DD4hep to be merged first.

So, do I understand correctly that even if these XMLs are not in the cmsExtended2021 scenario, they will still be put in Run 3 DB?

cvuosalo · 2020-09-15T17:00:58Z

@jan-kaspar @ghugo83

It is not clear to me, what is the best for us for 2021 (or generally for Run3). Shall we again go for a private production of the DB payloads or shall we do it via the dictionaries? What would be the pros and cons of the two solutions?

In the Prod DB there is a GeometryFileRcd with the "Extended" label. That record is in use by many sub-detectors for geometry. It is obtained with DDDectectorESProducer with fromDB = True and label = "Extended". There will be one such record for the latest Run 3 Global Tag. If PPS wants to use that record for PPS geometry, the PPS XML files must be listed in the Extended 2021 geometry dictionary.

PPS could have its own GeometryFileRcd with a label different than "Extended". Alternatively, PPS could get its geometry from XML files rather than from the DB. PPS is already getting its Reco geometry from a GeometryFileRcd with label "CTPPS". I don't see any code where PPS is requesting the "Extended" GeometryFileRcd, but maybe that is planned.

How should PPS function in a standard Run 3 MC workflow? How much PPS simulation and reconstruction is enabled in a standard workflow?

cvuosalo · 2020-09-15T17:06:23Z

@ghugo83

So, do I understand correctly that even if these XMLs are not in the cmsExtended2021 scenario, they will still be put in Run 3 DB?

The XML files listed in cmsExtended2021 go into the "Extended" GeometryFileRcd in the DB. It would be possible to put the 2021 PPS XML files into another record in the DB, but that would be up to PPS to do and to make work.

jan-kaspar · 2020-09-16T09:12:45Z

Yes the branch is at: https://github.com/ghugo83/cmssw/compare/parallel_oldDD_DD4hep...ghugo83:PPS_2021_rebase?expand=1
It is ready (apart from renaming a boolean, but that takes nearly no time).
Just have to get the PR porting PPS to DD4hep to be merged first.

Thanks @ghugo83 ! #31383 is merged now, so I guess we can go ahead.

Actually, before opening the PR, we should take care of setting the "isRun2" flag correctly for the "from DB" scenario. We could use the Configuration.Eras.Modifier_ctpps_2016_cff which is activated for all Run2 years of PPS existence (2016 to 2018). (Yes, it has a misleading name - for historical reasons.) What do you think?

jan-kaspar · 2020-09-16T09:19:51Z

Many thanks @cvuosalo

In the Prod DB there is a GeometryFileRcd with the "Extended" label. That record is in use by many sub-detectors for geometry. It is obtained with DDDectectorESProducer with fromDB = True and label = "Extended". There will be one such record for the latest Run 3 Global Tag. If PPS wants to use that record for PPS geometry, the PPS XML files must be listed in the Extended 2021 geometry dictionary.

This sounds to me as a good solution for PPS simulation geometry - but this is in the hands of @mundim .

PPS could have its own GeometryFileRcd with a label different than "Extended". Alternatively, PPS could get its geometry from XML files rather than from the DB. PPS is already getting its Reco geometry from a GeometryFileRcd with label "CTPPS". I don't see any code where PPS is requesting the "Extended" GeometryFileRcd, but maybe that is planned.

This sounds to me as a good solution for PPS reco geometry - no change wrt. the currently working solution.

How should PPS function in a standard Run 3 MC workflow? How much PPS simulation and reconstruction is enabled in a standard workflow?

In Run2 (since ~2016), PPS was fully included in reco workflows, but not in any simu wf.

The full simulation of PPS is now being integrated in CMSSW. Therefore with a bit of optimism, my guess for Run3 is that PPS will be fully included in both reco and simu workflows.

jan-kaspar · 2020-09-16T09:21:02Z

@ghugo83

So, do I understand correctly that even if these XMLs are not in the cmsExtended2021 scenario, they will still be put in Run 3 DB?

The XML files listed in cmsExtended2021 go into the "Extended" GeometryFileRcd in the DB. It would be possible to put the 2021 PPS XML files into another record in the DB, but that would be up to PPS to do and to make work.

I guess that - with your advice - this should be a straight-forward step, shouldn't it?

ghugo83 · 2020-09-16T09:50:29Z

Ok the latest branch is at:
https://github.com/ghugo83/cmssw/compare/parallel_oldDD_DD4hep...ghugo83:PPS_2021_rebase?expand=1
@forthommel says he will open the PR .

ghugo83 · 2020-09-16T10:07:47Z

I guess that - with your advice - this should be a straight-forward step, shouldn't it?

Yep

ghugo83 · 2020-09-16T10:09:14Z

The full simulation of PPS is now being integrated in CMSSW. Therefore with a bit of optimism, my guess for Run3 is that PPS will be fully included in both reco and simu workflows.

Haaa that's why, makes sense.

ghugo83 · 2020-09-16T10:26:18Z

Actually, before opening the PR, we should take care of setting the "isRun2" flag correctly for the "from DB" scenario. We could use the Configuration.Eras.Modifier_ctpps_2016_cff which is activated for all Run2 years of PPS existence (2016 to 2018). (Yes, it has a misleading name - for historical reasons.) What do you think?

Sth I don't like though, with this possibility of only grepping the Run2 scenarios, and not the Run3 ones, is it means isRun2 must be set to false by default?
Which is not safe for the existing scenarios?

ghugo83 · 2020-09-16T10:30:23Z

Just set isRun2 to false by default, after discussion with @forthommel

jan-kaspar · 2020-09-16T10:31:40Z

I suggest the following

in geometryRPFromDD_2017_cfi.py and the 2018 one: put isRun2 = True
in geometryRPFromDD_2021_cfi.py (if there is one) put isRun2 = False
in geometryRPFromDB_cfi.py put isRun2 = False by default and override it to True with ctpps_2016 modifier

ghugo83 · 2020-09-16T10:31:54Z

Ok I am fully done with https://github.com/ghugo83/cmssw/compare/parallel_oldDD_DD4hep...ghugo83:PPS_2021_rebase?expand=1
@forthommel , please check overlap in your XMLs and open PR :)

ghugo83 · 2020-09-16T10:32:23Z

I suggest the following

in geometryRPFromDD_2017_cfi.py and the 2018 one: put isRun2 = True
in geometryRPFromDD_2021_cfi.py (if there is one) put isRun2 = False
in geometryRPFromDB_cfi.py put isRun2 = False by default and override it to True with ctpps_2016 modifier

Perfect, exactly what is done now

jan-kaspar · 2020-09-16T10:32:25Z

Ok I am fully done with https://github.com/ghugo83/cmssw/compare/parallel_oldDD_DD4hep...ghugo83:PPS_2021_rebase?expand=1
@forthommel , please check overlap in your XMLs and open PR :)

Please set the isRun2 flag correctly first!

jan-kaspar · 2020-09-16T10:34:19Z

I suggest the following

in geometryRPFromDD_2017_cfi.py and the 2018 one: put isRun2 = True
in geometryRPFromDD_2021_cfi.py (if there is one) put isRun2 = False
in geometryRPFromDB_cfi.py put isRun2 = False by default and override it to True with ctpps_2016 modifier

Perfect, exactly what is done now

OK, I see it now here: https://github.com/ghugo83/cmssw/compare/parallel_oldDD_DD4hep...ghugo83:PPS_2021_rebase?expand=1#diff-3aff74325a83642694f2f94a497cb281R22 Thanks!

ghugo83 · 2020-09-16T10:34:35Z

@jan-kaspar yes it is done, sorry it is a commit I pushed 1 min ago :)

jan-kaspar · 2020-09-16T10:35:22Z

Yes, we were writing in parallel. All good from my side. Thanks!

ghugo83 · 2020-09-16T10:36:39Z

Ok so now @forthommel just has to open the PR, after he checks overlaps in his XMLs.

ghugo83 · 2020-09-16T11:24:06Z

Ok great! Closing all my open windows, and switching to another topic then.
@forthommel , please open the PR today :)

cmsbuild added this to the CMSSW_11_2_X milestone Jun 15, 2020

cmsbuild added code-checks-pending comparison-pending geometry-pending orp-pending pending-signatures reconstruction-pending simulation-pending tests-pending labels Jun 15, 2020

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

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

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

cmsbuild added code-checks-rejected and removed code-checks-pending labels Sep 15, 2020

forthommel closed this Sep 15, 2020

forthommel mentioned this pull request Sep 16, 2020

[PPS] 2021 conditions for timing detectors geometry (resubmission after DD4hep) #31484

Merged

3 tasks

forthommel deleted the pps-diam_geom_fixes-11_2_X branch March 29, 2021 06:50

[PPS] Timing detector preparation for 2021 conditions #30252

[PPS] Timing detector preparation for 2021 conditions #30252

Conversation

forthommel commented Jun 15, 2020 • edited Loading

PR description:

PR validation:

if this PR is a backport please specify the original PR and why you need to backport that PR: N/A

cmsbuild commented Jun 15, 2020

cmsbuild commented Jun 15, 2020

cmsbuild commented Jun 15, 2020

forthommel commented Jun 15, 2020

cvuosalo commented Jun 15, 2020 • edited Loading

cvuosalo commented Jun 15, 2020

jan-kaspar commented Jun 15, 2020

jan-kaspar commented Jun 15, 2020

cvuosalo commented Jun 15, 2020

cvuosalo commented Jun 15, 2020

cmsbuild commented Jun 15, 2020 • edited Loading

cmsbuild commented Jun 15, 2020

cmsbuild commented Jun 15, 2020

cmsbuild commented Sep 15, 2020

cmsbuild commented Sep 15, 2020

forthommel commented Sep 15, 2020

civanch commented Sep 15, 2020

jan-kaspar commented Sep 15, 2020

ghugo83 commented Sep 15, 2020

cvuosalo commented Sep 15, 2020

cvuosalo commented Sep 15, 2020

jan-kaspar commented Sep 16, 2020

jan-kaspar commented Sep 16, 2020

jan-kaspar commented Sep 16, 2020

ghugo83 commented Sep 16, 2020 • edited Loading

ghugo83 commented Sep 16, 2020 • edited Loading

ghugo83 commented Sep 16, 2020 • edited Loading

ghugo83 commented Sep 16, 2020 • edited Loading

ghugo83 commented Sep 16, 2020

jan-kaspar commented Sep 16, 2020

ghugo83 commented Sep 16, 2020

ghugo83 commented Sep 16, 2020

jan-kaspar commented Sep 16, 2020

jan-kaspar commented Sep 16, 2020

ghugo83 commented Sep 16, 2020

jan-kaspar commented Sep 16, 2020

ghugo83 commented Sep 16, 2020 • edited Loading

ghugo83 commented Sep 16, 2020

forthommel commented Jun 15, 2020 •

edited

Loading

cvuosalo commented Jun 15, 2020 •

edited

Loading

cmsbuild commented Jun 15, 2020 •

edited

Loading

ghugo83 commented Sep 16, 2020 •

edited

Loading

ghugo83 commented Sep 16, 2020 •

edited

Loading

ghugo83 commented Sep 16, 2020 •

edited

Loading

ghugo83 commented Sep 16, 2020 •

edited

Loading

ghugo83 commented Sep 16, 2020 •

edited

Loading