Merge pull request #39883 from mandrenguyen/rawPrimeRun3dataWorkflow_…

…125X [12_5_X] Raw prime wf for Run 3 data w/ dropped strips + approx. clusters
cms-sw · Nov 2, 2022 · 2796da7 · 2796da7
2 parents 5c7671a + 5442a1e
commit 2796da7
Show file tree

Hide file tree

Showing 9 changed files with 68 additions and 11 deletions.
diff --git a/Configuration/Eras/python/Era_Run3_pp_on_PbPb_approxSiStripClusters_cff.py b/Configuration/Eras/python/Era_Run3_pp_on_PbPb_approxSiStripClusters_cff.py
@@ -0,0 +1,6 @@
+import FWCore.ParameterSet.Config as cms
+
+from Configuration.Eras.Era_Run3_pp_on_PbPb_cff import Run3_pp_on_PbPb
+from Configuration.ProcessModifiers.approxSiStripClusters_cff import approxSiStripClusters
+
+Run3_pp_on_PbPb_approxSiStripClusters = cms.ModifierChain(Run3_pp_on_PbPb, approxSiStripClusters)
diff --git a/Configuration/EventContent/python/EventContent_cff.py b/Configuration/EventContent/python/EventContent_cff.py
@@ -180,7 +180,7 @@ def SwapKeepAndDrop(l):
 from Configuration.ProcessModifiers.approxSiStripClusters_cff import approxSiStripClusters
 approxSiStripClusters.toModify(RAWEventContent,
                               outputCommands = RAWEventContent.outputCommands+[
-                                  'keep *_SiStripClusters2ApproxClustersHLT_*_*'
+                                  'keep *_hltSiStripClusters2ApproxClusters_*_*'
                               ])
 
 #
@@ -619,6 +619,10 @@ def SwapKeepAndDrop(l):
 FEVTDEBUGEventContent.outputCommands.extend(SimMuonFEVTDEBUG.outputCommands)
 FEVTDEBUGEventContent.outputCommands.extend(SimCalorimetryFEVTDEBUG.outputCommands)
 FEVTDEBUGEventContent.outputCommands.extend(SimFastTimingFEVTDEBUG.outputCommands)
+approxSiStripClusters.toModify(FEVTDEBUGEventContent,
+                              outputCommands = FEVTDEBUGEventContent.outputCommands+[
+                                  'keep *_hltSiStripClusters2ApproxClusters_*_*'
+                              ])
 #
 #
 # FEVTDEBUGHLT Data Tier definition
@@ -633,6 +637,10 @@ def SwapKeepAndDrop(l):
 FEVTDEBUGHLTEventContent.outputCommands.append('keep *_*_MergedTrackTruth_*')
 FEVTDEBUGHLTEventContent.outputCommands.append('keep *_*_StripDigiSimLink_*')
 FEVTDEBUGHLTEventContent.outputCommands.append('keep *_*_PixelDigiSimLink_*')
+approxSiStripClusters.toModify(FEVTDEBUGHLTEventContent,
+                              outputCommands = FEVTDEBUGHLTEventContent.outputCommands+[
+                                  'keep *_hltSiStripClusters2ApproxClusters_*_*'
+                              ])
 
 from Configuration.ProcessModifiers.premix_stage2_cff import premix_stage2
 
@@ -778,7 +786,9 @@ def SwapKeepAndDrop(l):
 REPACKRAWEventContent.outputCommands.extend(HLTriggerRAW.outputCommands)
 approxSiStripClusters.toModify(REPACKRAWEventContent,
                                outputCommands = REPACKRAWEventContent.outputCommands+[
-                                   'keep *_SiStripClusters2ApproxClustersHLT_*_*'
+                                   'keep *_hltSiStripClusters2ApproxClusters_*_*',
+                                   'drop FEDRawDataCollection_rawDataRepacker_*_*',
+                                   'keep FEDRawDataCollection_rawPrimeDataRepacker_*_*'
                                ])
 
 REPACKRAWSIMEventContent = cms.PSet(

diff --git a/Configuration/PyReleaseValidation/python/relval_standard.py b/Configuration/PyReleaseValidation/python/relval_standard.py
@@ -132,6 +132,7 @@
 workflows[140.5611] = ['',['RunHI2018AOD','REMINIAODHID18','HARVESTHI18MINIAOD']]
 workflows[140.57] = ['',['RunHI2018Reduced','RECOHID18','HARVESTDHI18']]
 workflows[140.58] = ['',['RunHI2018','RAWPRIMEHI18','RECOHID18APPROXCLUSTERS','HARVESTDHI18']]
+workflows[140.60] = ['',['RunHI2022','RAWPRIMEHI22','RECOHID22APPROXCLUSTERS','HARVESTDHI22']]
 
 ### run2 2015B 50ns ###
 workflows[134.701] = ['',['RunHLTPhy2015B','HLTDR2_50ns','RECODR2_50nsreHLT_HIPM','HARVESTDR2']]

diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py
@@ -112,6 +112,9 @@
 steps['RunHI2018Reduced']={'INPUT':InputInfo(dataSet='/HIMinimumBiasReducedFormat0/HIRun2018A-v1/RAW',label='hi2018reduced',events=10000,location='STD',ls=Run2018HI)}
 steps['RunHI2018AOD']={'INPUT':InputInfo(dataSet='/HIHardProbes/HIRun2018A-04Apr2019-v1/AOD',label='hi2018aod',events=10000,location='STD',ls=Run2018HI)}
 
+Run2022HI={360761: [[112,112]]}
+steps['RunHI2022']={'INPUT':InputInfo(dataSet='/EphemeralHLTPhysics0/Run2022F-v1/RAW',label='hi2022',events=10000,location='STD',ls=Run2022HI)}
+
 Run2012A=[191226]
 Run2012ASk=Run2012A+[]
 steps['RunMinBias2012A']={'INPUT':InputInfo(dataSet='/MinimumBias/Run2012A-v1/RAW',label='2012A',run=Run2012A, events=100000,location='STD')}
@@ -1015,7 +1018,7 @@ def genS(fragment,howMuch):
 hiAlca2018 = {'--conditions':'auto:phase1_2018_realistic_hi', '--era':'Run2_2018'}
 hiAlca2018_ppReco = {'--conditions':'auto:phase1_2018_realistic_hi', '--era':'Run2_2018_pp_on_AA'}
 hiAlca2021_ppReco = {'--conditions':'auto:phase1_2022_realistic_hi', '--era':'Run3_pp_on_PbPb'}
-hiAlca2021_ppReco_approxClusters = {'--conditions':'auto:phase1_2022_realistic_hi', '--era':'Run3_pp_on_PbPb', '--procModifiers':'approxSiStripClusters'}
+hiAlca2021_ppReco_approxClusters = {'--conditions':'auto:phase1_2022_realistic_hi', '--era':'Run3_pp_on_PbPb_approxSiStripClusters'}
 
 
 hiDefaults2011=merge([hiAlca2011,{'--scenario':'HeavyIons','-n':2}])
@@ -2031,6 +2034,7 @@ def lhegensim2018ml(fragment,howMuch):
                         '--customise':'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2018_pp_on_AA',
                         '-n':'10',
                         '--procModifiers':'approxSiStripClusters',
+                        '--customise_commands':'\"process.rawPrimeDataRepacker.inputTag=\'rawDataRepacker\'\"',
                         '--repacked':'',
                         '--process':'REHLT'
 }
@@ -2070,6 +2074,28 @@ def lhegensim2018ml(fragment,howMuch):
                           '-n':'100'
 }
 
+steps['RAWPRIMEHI22']={ '--scenario':'pp',
+                        '--conditions':'auto:run3_data_prompt',
+                        '-s':'REPACK:DigiToApproxClusterRaw',
+                        '--datatier':'GEN-SIM-DIGI-RAW-HLTDEBUG',
+                        '--eventcontent':'REPACKRAW',
+                        '--era':'Run3_pp_on_PbPb_approxSiStripClusters',
+                        '-n':'10',
+                        '--customise_commands':'\"process.siStripDigisHLT.ProductLabel=\'rawDataCollector\'\"',
+                        '--process':'REHLT'
+}
+
+steps['RECOHID22APPROXCLUSTERS']=merge([{ '--scenario':'pp',
+                                          '--conditions':'auto:run3_data_prompt',
+                                          '-s':'RAW2DIGI,L1Reco,RECO,DQM:@commonFakeHLT+@standardDQMFakeHLT',
+                                          '--datatier':'AOD,DQMIO',
+                                          '--eventcontent':'AOD,DQM',
+                                          '--era':'Run3_pp_on_PbPb_approxSiStripClusters',
+                                          '--repacked':'',
+                                          '-n':'10'
+                                      },steps['RECOHID15']])
+
+
 steps['TIER0']=merge([{'--customise':'Configuration/DataProcessing/RecoTLR.customisePrompt',
                        '-s':'RAW2DIGI,L1Reco,RECO,ALCAPRODUCER:@allForPrompt,DQM:@allForPrompt,ENDJOB',
                        '--datatier':'RECO,AOD,ALCARECO,DQMIO',
@@ -3272,6 +3298,10 @@ def gen2021HiMix(fragment,howMuch):
                                     '--era' : 'Run2_2018_pp_on_AA',
                                     '--filetype':'DQM',
                                     '-n':100},hiDefaults2018_ppReco])
+
+steps['HARVESTDHI22']=merge([{ '--era':'Run3_pp_on_PbPb',
+                               '--scenario':'pp',
+                               '--conditions':'auto:run3_data'},steps['HARVESTDHI15']])
 
 steps['HARVESTDRUN3']={'-s':'HARVESTING:@standardDQMFakeHLT+@miniAODDQM+@nanoAODDQM',
                    '--conditions':'auto:run3_data',

diff --git a/Configuration/StandardSequences/python/DigiToRaw_Repack_cff.py b/Configuration/StandardSequences/python/DigiToRaw_Repack_cff.py
@@ -72,7 +72,14 @@
                                         cms.InputTag('siStripZeroSuppressionHLT','ScopeMode')),
                                 )
 
-from RecoLocalTracker.SiStripClusterizer.SiStripClusters2ApproxClusters_cff import SiStripClusters2ApproxClustersHLT
+from RecoLocalTracker.SiStripClusterizer.SiStripClusters2ApproxClusters_cff import hltSiStripClusters2ApproxClusters
 
-DigiToApproxClusterRawTask = cms.Task(siStripDigisHLT,siStripZeroSuppressionHLT,siStripClustersHLT,SiStripClusters2ApproxClustersHLT)
+
+from EventFilter.Utilities.EvFFEDSelector_cfi import *
+rawPrimeDataRepacker = cms.EDProducer( "EvFFEDSelector",
+  fedList = cms.vuint32( [ 520, 522, 523, 524, 525, 528, 529, 530, 531, 532, 534, 535, 537, 539, 540, 541, 542, 545, 546, 547, 548, 549, 551, 553, 554, 555, 556, 557, 560, 561, 563, 564, 565, 566, 568, 570, 571, 572, 573, 574, 577, 578, 580, 582, 583, 584, 585, 586, 587, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 614, 615, 616, 617, 618, 619, 620, 621, 622, 623, 624, 625, 626, 627, 628, 629, 630, 631, 632, 633, 634, 635, 636, 637, 638, 639, 640, 641, 642, 643, 644, 645, 646, 647, 648, 649, 650, 651, 652, 653, 654, 661, 662, 663, 664, 690, 691, 692, 693, 724, 725, 726, 727, 728, 729, 730, 731, 735, 790, 791, 792, 793, 814, 816, 817, 818, 819, 820, 821, 822, 823, 824, 831, 832, 833, 834, 835, 836, 837, 838, 839, 841, 842, 843, 844, 845, 846, 847, 848, 849, 851, 852, 853, 854, 855, 856, 857, 858, 859, 861, 862, 863, 864, 865, 866, 867, 868, 869, 1024, 1025, 1026, 1027, 1028, 1029, 1030, 1031, 1032, 1033, 1034, 1035, 1036, 1037, 1038, 1039, 1040, 1041, 1042, 1043, 1044, 1045, 1046, 1047, 1048, 1049, 1050, 1051, 1100, 1101, 1102, 1103, 1104, 1105, 1106, 1107, 1108, 1109, 1110, 1111, 1112, 1113, 1114, 1115, 1116, 1117, 1118, 1119, 1120, 1121, 1122, 1123, 1134, 1135, 1200, 1201, 1202, 1203, 1204, 1205, 1206, 1207, 1208, 1209, 1212, 1213, 1214, 1215, 1216, 1217, 1218, 1219, 1220, 1221, 1224, 1225, 1226, 1227, 1228, 1229, 1230, 1231, 1232, 1233, 1236, 1237, 1238, 1239, 1240, 1241, 1242, 1243, 1244, 1245, 1248, 1249, 1250, 1251, 1252, 1253, 1254, 1255, 1256, 1257, 1260, 1261, 1262, 1263, 1264, 1265, 1266, 1267, 1268, 1269, 1272, 1273, 1274, 1275, 1276, 1277, 1278, 1279, 1280, 1281, 1284, 1285, 1286, 1287, 1288, 1289, 1290, 1291, 1292, 1293, 1296, 1297, 1298, 1299, 1300, 1301, 1302, 1308, 1309, 1310, 1311, 1312, 1313, 1314, 1320, 1321, 1322, 1323, 1324, 1325, 1326, 1332, 1333, 1334, 1335, 1336, 1337, 1338, 1354, 1356, 1358, 1360, 1368, 1369, 1370, 1371, 1376, 1377, 1380, 1381, 1384, 1385, 1386, 1390, 1391, 1392, 1393, 1394, 1395, 1402, 1404, 1405, 1462, 1463, 1467 ] ),
+  inputTag = cms.InputTag( "rawDataCollector" )
+)
+
+DigiToApproxClusterRawTask = cms.Task(siStripDigisHLT,siStripZeroSuppressionHLT,siStripClustersHLT,hltSiStripClusters2ApproxClusters,rawPrimeDataRepacker)
 DigiToApproxClusterRaw = cms.Sequence(DigiToApproxClusterRawTask)
diff --git a/Configuration/StandardSequences/python/Eras.py b/Configuration/StandardSequences/python/Eras.py
@@ -36,6 +36,7 @@ def __init__(self):
                  'Run3',
                  'Run3_noMkFit',
                  'Run3_pp_on_PbPb',
+                 'Run3_pp_on_PbPb_approxSiStripClusters',
                  'Run3_dd4hep',
                  'Run3_DDD',
                  'Run3_FastSim',

diff --git a/EventFilter/RawDataCollector/src/RawDataMapperByLabel.cc b/EventFilter/RawDataCollector/src/RawDataMapperByLabel.cc
@@ -92,9 +92,11 @@ void RawDataMapperByLabel::produce(Event& e, const EventSetup& c) {
 void RawDataMapperByLabel::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
   edm::ParameterSetDescription desc;
 
-  desc.add<std::vector<edm::InputTag>>(
-      "rawCollectionList",
-      {{"rawDataCollector", "", "@skipCurrentProcess"}, {"rawDataRepacker"}, {"rawDataReducedFormat"}});
+  desc.add<std::vector<edm::InputTag>>("rawCollectionList",
+                                       {{"rawDataCollector", "", "@skipCurrentProcess"},
+                                        {"rawDataRepacker"},
+                                        {"rawPrimeDataRepacker"},
+                                        {"rawDataReducedFormat"}});
   desc.add<edm::InputTag>("mainCollection", edm::InputTag("rawDataCollector"));
 
   descriptions.add("rawDataMapperByLabel", desc);

diff --git a/RecoLocalTracker/SiStripClusterizer/python/SiStripClusterizer_RealData_cfi.py b/RecoLocalTracker/SiStripClusterizer/python/SiStripClusterizer_RealData_cfi.py
@@ -14,7 +14,7 @@
 from Configuration.ProcessModifiers.approxSiStripClusters_cff import approxSiStripClusters
 from RecoLocalTracker.SiStripClusterizer.SiStripApprox2Clusters_cfi import SiStripApprox2Clusters
 SiStripApprox2Clusters.inputApproxClusters = 'SiStripClusters2ApproxClusters'
-approxSiStripClusters.toModify(SiStripApprox2Clusters, inputApproxClusters = 'SiStripClusters2ApproxClustersHLT')
+approxSiStripClusters.toModify(SiStripApprox2Clusters, inputApproxClusters = 'hltSiStripClusters2ApproxClusters')
 approxSiStripClusters.toReplaceWith(siStripClusters,SiStripApprox2Clusters)
 
 # The SiStripClusters are not used anymore in phase2 tracking

diff --git a/RecoLocalTracker/SiStripClusterizer/python/SiStripClusters2ApproxClusters_cff.py b/RecoLocalTracker/SiStripClusterizer/python/SiStripClusters2ApproxClusters_cff.py
@@ -1,5 +1,5 @@
 from RecoLocalTracker.SiStripClusterizer.SiStripClusters2ApproxClusters_cfi import *
 
 from Configuration.ProcessModifiers.approxSiStripClusters_cff import approxSiStripClusters
-SiStripClusters2ApproxClustersHLT = SiStripClusters2ApproxClusters.clone()
-approxSiStripClusters.toModify(SiStripClusters2ApproxClustersHLT, inputClusters = "siStripClustersHLT")
+hltSiStripClusters2ApproxClusters = SiStripClusters2ApproxClusters.clone()
+approxSiStripClusters.toModify(hltSiStripClusters2ApproxClusters, inputClusters = "siStripClustersHLT")