Merge branch 'cms-sw:master' into pccVetoList2022_13_0_0

Alignment/CocoaModel/src/EntryMgr.cc

@@ -114,8 +114,8 @@ EntryData* EntryMgr::findEntryByLongName(const ALIstring& optoName, const ALIstr
 //@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
 EntryData* EntryMgr::findEntry(const std::vector<ALIstring>& wl) {
   EntryData* data = nullptr;
-  ALIstring optoName = wl[2];
-  ALIstring entryName = wl[3];
+  const ALIstring& optoName = wl[2];
+  const ALIstring& entryName = wl[3];
   data = findEntryByLongName(optoName, entryName);
 
   return data;

Alignment/CocoaModel/src/Model.cc

@@ -358,7 +358,7 @@ void Model::readSystemDescription() {
             std::cerr << "!!!SYSTEM_TREE_DESCRIPTION section: object " << *((*vvscite).begin())
                       << " is not hanging from object 'system' " << std::endl;
             for (vvscite = OptODictionary().begin(); vvscite != OptODictionary().end(); ++vvscite) {
-              std::vector<ALIstring> ptemp = *vvscite;
+              const std::vector<ALIstring>& ptemp = *vvscite;
               ALIUtils::dumpVS(ptemp, "OBJECT ", std::cerr);
             }
             exit(9);

Alignment/CommonAlignment/python/tools/trackselectionRefitting.py

@@ -2,6 +2,9 @@
 import sys
 import FWCore.ParameterSet.Config as cms
 
+def customlog(s):
+    print("# MSG-i trackselectionRefitting:  %s" % s)
+
 def getSequence(process, collection,
                 saveCPU = False,
                 TTRHBuilder = "WithAngleAndTemplate",
@@ -52,13 +55,13 @@ def getSequence(process, collection,
     # resolve default values incl. consistency checks #
     ###################################################
 
-    print("g4Refitting=",g4Refitting)
+    customlog("g4Refitting=%s" % g4Refitting)
 
     if usePixelQualityFlag is None:
         if "Template" not in TTRHBuilder:
             usePixelQualityFlag = False # not defined without templates
-            print("Using 'TTRHBuilder' without templates:", TTRHBuilder)
-            print(" --> Turning off pixel quality flag in hit filter.")
+            customlog("Using 'TTRHBuilder' without templates %s" % TTRHBuilder)
+            customlog(" --> Turning off pixel quality flag in hit filter.")
         else:
             usePixelQualityFlag = True # default for usage with templates
 
@@ -371,11 +374,11 @@ def getSequence(process, collection,
     else:
         if mods[-1][-1]["method"] == "load" and \
                 not mods[-1][-1].get("clone", False):
-            print("Name of the last module needs to be modifiable.")
+            customlog("Name of the last module needs to be modifiable.")
             sys.exit(1)
 
         if g4Refitting:
-            print("Here we must include geopro first")
+            customlog("Here we must include geopro first")
             process.load('Configuration.StandardSequences.GeometryDB_cff')
             process.load("TrackPropagation.Geant4e.geantRefit_cff")
             modules.append(getattr(process,"geopro"))
@@ -453,7 +456,7 @@ def _getModule(process, src, modType, moduleName, options, **kwargs):
             obj = getattr(process, objTuple[1])
             moduleName = objTuple[1]
     else:
-        print("Unknown method:", method)
+        customlog("Unknown method: %s" % method)
         sys.exit(1)
 
     if modType == "TrackSplitting":

Alignment/CommonAlignment/test/BuildFile.xml

@@ -1,4 +1,4 @@
 <bin file="test_AlignableObjectId.cc">
   <use name="Alignment/CommonAlignment"/>
 </bin>
-<test name="test_CreateFileLists" command="tkal_create_file_lists.py --test-mode --force -i /OVERRIDDEN/IN/TESTMODE -o ${LOCALTOP}/tmp/mps_create_file_lists -n 200000 --iov 42 --iov 174"/>
+<test name="test_CreateFileLists" command="tkal_create_file_lists.py --test-mode --force -i /OVERRIDDEN/IN/TESTMODE -o ./mps_create_file_lists -n 200000 --iov 42 --iov 174"/>

Alignment/CommonAlignmentAlgorithm/src/TkModuleGroupSelector.cc

@@ -27,7 +27,7 @@ TkModuleGroupSelector::TkModuleGroupSelector(AlignableTracker *aliTracker,
   std::vector<std::string> parameterNames = cfg.getParameterNames();
   for (std::vector<std::string>::const_iterator iParam = parameterNames.begin(); iParam != parameterNames.end();
        ++iParam) {
-    const std::string name = (*iParam);
+    const std::string &name = (*iParam);
     if (name != "RunRange" && name != "ReferenceRun" && name != "Granularity") {
       throw cms::Exception("BadConfig") << "@SUB=TkModuleGroupSelector::TkModuleGroupSelector:"
                                         << " Unknown parameter name '" << name << "' in PSet. Maybe a typo?";
@@ -107,7 +107,7 @@ void TkModuleGroupSelector::verifyParameterNames(const edm::ParameterSet &pset,
   std::vector<std::string> parameterNames = pset.getParameterNames();
   for (std::vector<std::string>::const_iterator iParam = parameterNames.begin(); iParam != parameterNames.end();
        ++iParam) {
-    const std::string name = (*iParam);
+    const std::string &name = (*iParam);
     if (name != "levels" && name != "RunRange" && name != "split" && name != "ReferenceRun") {
       throw cms::Exception("BadConfig") << "@SUB=TkModuleGroupSelector::verifyParameterNames:"
                                         << " Unknown parameter name '" << name << "' in PSet number " << psetnr

Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorAsAnalyzer.cc

@@ -44,7 +44,6 @@
 #include "Geometry/CommonTopologies/interface/GeometryAligner.h"
 #include "CondFormats/GeometryObjects/interface/PTrackerParameters.h"
 #include "Geometry/Records/interface/PTrackerParametersRcd.h"
-#include "Geometry/Records/interface/PTrackerAdditionalParametersPerDetRcd.h"
 #include "Geometry/Records/interface/MuonGeometryRecord.h"
 #include "CondFormats/AlignmentRecord/interface/TrackerAlignmentRcd.h"
 #include "CondFormats/AlignmentRecord/interface/TrackerAlignmentErrorExtendedRcd.h"
@@ -89,7 +88,6 @@ class AlignmentMonitorAsAnalyzer : public edm::one::EDAnalyzer<> {
   const edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> esTokenTTopo_;
   const edm::ESGetToken<GeometricDet, IdealGeometryRecord> esTokenGeomDet_;
   const edm::ESGetToken<PTrackerParameters, PTrackerParametersRcd> esTokenPTP_;
-  const edm::ESGetToken<PTrackerAdditionalParametersPerDet, PTrackerAdditionalParametersPerDetRcd> esTokenPtitp_;
   const edm::ESGetToken<DTGeometry, MuonGeometryRecord> esTokenDT_;
   const edm::ESGetToken<CSCGeometry, MuonGeometryRecord> esTokenCSC_;
   const edm::ESGetToken<GEMGeometry, MuonGeometryRecord> esTokenGEM_;
@@ -123,7 +121,6 @@ AlignmentMonitorAsAnalyzer::AlignmentMonitorAsAnalyzer(const edm::ParameterSet&
       esTokenTTopo_(esConsumes()),
       esTokenGeomDet_(esConsumes()),
       esTokenPTP_(esConsumes()),
-      esTokenPtitp_(esConsumes()),
       esTokenDT_(esConsumes(edm::ESInputTag("", "idealForAlignmentMonitorAsAnalyzer"))),
       esTokenCSC_(esConsumes(edm::ESInputTag("", "idealForAlignmentMonitorAsAnalyzer"))),
       esTokenGEM_(esConsumes(edm::ESInputTag("", "idealForAlignmentMonitorAsAnalyzer"))),
@@ -160,9 +157,8 @@ void AlignmentMonitorAsAnalyzer::analyze(const edm::Event& iEvent, const edm::Ev
 
     const GeometricDet* geom = &iSetup.getData(esTokenGeomDet_);
     const PTrackerParameters& ptp = iSetup.getData(esTokenPTP_);
-    const PTrackerAdditionalParametersPerDet* ptitp = &iSetup.getData(esTokenPtitp_);
     TrackerGeomBuilderFromGeometricDet trackerBuilder;
-    std::shared_ptr<TrackerGeometry> theTracker(trackerBuilder.build(geom, ptitp, ptp, tTopo));
+    std::shared_ptr<TrackerGeometry> theTracker(trackerBuilder.build(geom, ptp, tTopo));
 
     edm::ESHandle<DTGeometry> theMuonDT = iSetup.getHandle(esTokenDT_);
     edm::ESHandle<CSCGeometry> theMuonCSC = iSetup.getHandle(esTokenCSC_);

Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonResiduals.cc

@@ -1762,7 +1762,7 @@ void AlignmentMonitorMuonResiduals::event(const edm::Event &iEvent,
     std::vector<TrajectoryMeasurement> measurements = traj->measurements();
 
     for (std::vector<TrajectoryMeasurement>::const_iterator im = measurements.begin(); im != measurements.end(); ++im) {
-      const TrajectoryMeasurement meas = *im;
+      const TrajectoryMeasurement &meas = *im;
       const TransientTrackingRecHit *hit = &(*meas.recHit());
       const DetId id = hit->geographicalId();
 

Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorTemplate.cc

@@ -102,7 +102,7 @@ void AlignmentMonitorTemplate::event(const edm::Event& iEvent,
 
     std::vector<TrajectoryMeasurement> measurements = traj->measurements();
     for (std::vector<TrajectoryMeasurement>::const_iterator im = measurements.begin(); im != measurements.end(); ++im) {
-      const TrajectoryMeasurement meas = *im;
+      const TrajectoryMeasurement& meas = *im;
       const TransientTrackingRecHit* hit = &(*meas.recHit());
       const DetId id = hit->geographicalId();
 

Alignment/CommonAlignmentParametrization/src/CompositeAlignmentParameters.cc

@@ -169,7 +169,7 @@ AlgebraicMatrix CompositeAlignmentParameters::derivativesLegacy(const std::vecto
   int ipos = 1;
   AlgebraicMatrix selderiv(nparam, 2);
   for (std::vector<AlgebraicMatrix>::const_iterator imat = vecderiv.begin(); imat != vecderiv.end(); ++imat) {
-    AlgebraicMatrix thisselderiv = (*imat);
+    const AlgebraicMatrix &thisselderiv = (*imat);
     int npar = thisselderiv.num_row();
     selderiv.sub(ipos, 1, thisselderiv);
     ipos += npar;

Alignment/CommonAlignmentProducer/interface/AlignmentProducerBase.h

@@ -44,7 +44,6 @@
 #include "CondFormats/AlignmentRecord/interface/TrackerSurveyRcd.h"
 #include "CondFormats/AlignmentRecord/interface/TrackerSurveyErrorExtendedRcd.h"
 #include "CondFormats/GeometryObjects/interface/PTrackerParameters.h"
-#include "CondFormats/GeometryObjects/interface/PTrackerAdditionalParametersPerDet.h"
 #include "CondFormats/Common/interface/Time.h"
 
 #include "FWCore/Framework/interface/ESHandle.h"
@@ -60,7 +59,6 @@
 #include "Geometry/Records/interface/IdealGeometryRecord.h"
 #include "Geometry/Records/interface/MuonGeometryRecord.h"
 #include "Geometry/Records/interface/TrackerTopologyRcd.h"
-#include "Geometry/Records/interface/PTrackerAdditionalParametersPerDetRcd.h"
 
 #include "TrackingTools/PatternTools/interface/TrajTrackAssociation.h"
 
@@ -256,7 +254,6 @@ class AlignmentProducerBase {
   const edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> ttopoToken_;
   const edm::ESGetToken<GeometricDet, IdealGeometryRecord> geomDetToken_;
   const edm::ESGetToken<PTrackerParameters, PTrackerParametersRcd> ptpToken_;
-  const edm::ESGetToken<PTrackerAdditionalParametersPerDet, PTrackerAdditionalParametersPerDetRcd> ptitpToken_;
   const edm::ESGetToken<DTGeometry, MuonGeometryRecord> dtGeomToken_;
   const edm::ESGetToken<CSCGeometry, MuonGeometryRecord> cscGeomToken_;
   const edm::ESGetToken<GEMGeometry, MuonGeometryRecord> gemGeomToken_;

Alignment/CommonAlignmentProducer/plugins/AlignmentMuonHIPTrajectorySelector.cc

@@ -145,7 +145,7 @@ void AlignmentMuonHIPTrajectorySelector::produce(edm::Event& iEvent, const edm::
       double tracker_dof = 0.;
       for (std::vector<TrajectoryMeasurement>::const_iterator im = measurements.begin(); im != measurements.end();
            ++im) {
-        const TrajectoryMeasurement meas = *im;
+        const TrajectoryMeasurement& meas = *im;
         auto hit = &(*meas.recHit());
         const DetId id = hit->geographicalId();
 
@@ -193,7 +193,7 @@ void AlignmentMuonHIPTrajectorySelector::produce(edm::Event& iEvent, const edm::
 
         for (std::vector<TrajectoryMeasurement>::const_iterator im = measurements.begin(); im != measurements.end();
              ++im) {
-          const TrajectoryMeasurement meas = *im;
+          const TrajectoryMeasurement& meas = *im;
           auto hit = &(*meas.recHit());
           const DetId id = hit->geographicalId();
 

Alignment/CommonAlignmentProducer/plugins/GlobalTrackerMuonAlignment.cc

@@ -2664,7 +2664,7 @@ void GlobalTrackerMuonAlignment::misalignMuon(
   MuGlShift = d;
   MuGlAngle = a;
 
-  if ((d(1) == 0.) & (d(2) == 0.) & (d(3) == 0.) & (a(1) == 0.) & (a(2) == 0.) & (a(3) == 0.)) {
+  if ((d(1) == 0.) && (d(2) == 0.) && (d(3) == 0.) && (a(1) == 0.) && (a(2) == 0.) && (a(3) == 0.)) {
     Rm = GRm;
     Pm = GPm;
     if (debug_)
@@ -2822,7 +2822,7 @@ void GlobalTrackerMuonAlignment::misalignMuonL(GlobalVector& GRm,
   MuGlShift = d;
   MuGlAngle = a;
 
-  if ((d(1) == 0.) & (d(2) == 0.) & (d(3) == 0.) & (a(1) == 0.) & (a(2) == 0.) & (a(3) == 0.)) {
+  if ((d(1) == 0.) && (d(2) == 0.) && (d(3) == 0.) && (a(1) == 0.) && (a(2) == 0.) && (a(3) == 0.)) {
     Rm = GRm;
     Pm = GPm;
     AlgebraicVector4 Vm0;

Alignment/CommonAlignmentProducer/python/ALCARECOTkAlBeamHalo_Output_cff.py

@@ -6,13 +6,36 @@
         SelectEvents = cms.vstring('pathALCARECOTkAlBeamHalo')
     ),
     outputCommands = cms.untracked.vstring(
-        'keep *_ALCARECOTkAlBeamHalo_*_*', 
+        'keep recoTracks_ALCARECOTkAlBeamHalo_*_*',
+        'keep recoTrackExtras_ALCARECOTkAlBeamHalo_*_*',
+        'keep TrackingRecHitsOwned_ALCARECOTkAlBeamHalo_*_*',
+        'keep SiPixelClusteredmNewDetSetVector_ALCARECOTkAlBeamHalo_*_*',
+        'keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlBeamHalo_*_*',
         'keep L1AcceptBunchCrossings_*_*_*',
         'keep L1GlobalTriggerReadoutRecord_gtDigis_*_*',
         'keep *_TriggerResults_*_*',
         'keep DcsStatuss_scalersRawToDigi_*_*')
 )
 
+# in Run3, SCAL digis replaced by onlineMetaDataDigis
 import copy
+_run3_common_removedCommands = OutALCARECOTkAlBeamHalo_noDrop.outputCommands.copy()
+_run3_common_removedCommands.remove('keep DcsStatuss_scalersRawToDigi_*_*')
+
+_run3_common_extraCommands = ['keep DCSRecord_onlineMetaDataDigis_*_*',
+                              'keep OnlineLuminosityRecord_onlineMetaDataDigis_*_*']
+
+from Configuration.Eras.Modifier_run3_common_cff import run3_common
+run3_common.toModify(OutALCARECOTkAlBeamHalo_noDrop, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands)
+
+# in Phase2, remove the SiStrip clusters and keep the OT ones instead
+_phase2_common_removedCommands = OutALCARECOTkAlBeamHalo_noDrop.outputCommands.copy()
+_phase2_common_removedCommands.remove('keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlBeamHalo_*_*')
+
+_phase2_common_extraCommands = ['keep Phase2TrackerCluster1DedmNewDetSetVector_ALCARECOTkAlBeamHalo_*_*']
+
+from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
+phase2_common.toModify(OutALCARECOTkAlBeamHalo_noDrop, outputCommands = _phase2_common_removedCommands + _phase2_common_extraCommands )
+
 OutALCARECOTkAlBeamHalo = copy.deepcopy(OutALCARECOTkAlBeamHalo_noDrop)
 OutALCARECOTkAlBeamHalo.outputCommands.insert(0, "drop *")

Alignment/CommonAlignmentProducer/python/ALCARECOTkAlDiMuonAndVertex_Output_cff.py

@@ -6,13 +6,33 @@
         SelectEvents = cms.vstring('pathALCARECOTkAlDiMuonAndVertex')
     ),
     outputCommands = cms.untracked.vstring(
-        'keep *_ALCARECOTkAlDiMuon_*_*', 
-        'keep *_ALCARECOTkAlDiMuonVertexTracks_*_*',
+        'keep recoTracks_ALCARECOTkAlDiMuon_*_*',
+        'keep recoTrackExtras_ALCARECOTkAlDiMuon_*_*',
+        'keep TrackingRecHitsOwned_ALCARECOTkAlDiMuon_*_*',
+        'keep SiPixelClusteredmNewDetSetVector_ALCARECOTkAlDiMuon_*_*',
+        'keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlDiMuon_*_*',
+        'keep recoTracks_ALCARECOTkAlDiMuonVertexTracks_*_*',
+        'keep recoTrackExtras_ALCARECOTkAlDiMuonVertexTracks_*_*',
+        'keep TrackingRecHitsOwned_ALCARECOTkAlDiMuonVertexTracks_*_*',
+        'keep SiPixelClusteredmNewDetSetVector_ALCARECOTkAlDiMuonVertexTracks_*_*',
+        'keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlDiMuonVertexTracks_*_*',
         'keep L1AcceptBunchCrossings_*_*_*',
         'keep L1GlobalTriggerReadoutRecord_gtDigis_*_*',
         'keep *_TriggerResults_*_*',
         'keep DcsStatuss_scalersRawToDigi_*_*',
         'keep *_offlinePrimaryVertices_*_*')
 )
+
+# in Phase2, remove the SiStrip clusters and keep the OT ones instead
+_phase2_common_removedCommands = OutALCARECOTkAlDiMuonAndVertex_noDrop.outputCommands.copy()
+_phase2_common_removedCommands.remove('keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlDiMuon_*_*')
+_phase2_common_removedCommands.remove('keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlDiMuonVertexTracks_*_*')
+
+_phase2_common_extraCommands = ['keep Phase2TrackerCluster1DedmNewDetSetVector_ALCARECOTkAlDiMuon_*_*',
+                                'keep Phase2TrackerCluster1DedmNewDetSetVector_ALCARECOTkAlDiMuonVertexTracks_*_*']
+
+from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
+phase2_common.toModify(OutALCARECOTkAlDiMuonAndVertex_noDrop, outputCommands = _phase2_common_removedCommands + _phase2_common_extraCommands )
+
 OutALCARECOTkAlDiMuonAndVertex = OutALCARECOTkAlDiMuonAndVertex_noDrop.clone()
 OutALCARECOTkAlDiMuonAndVertex.outputCommands.insert(0, "drop *")

Alignment/CommonAlignmentProducer/python/ALCARECOTkAlJetHT_Output_cff.py

@@ -6,7 +6,11 @@
         SelectEvents = cms.vstring('pathALCARECOTkAlJetHT')
     ),
     outputCommands = cms.untracked.vstring(
-        'keep *_ALCARECOTkAlJetHT_*_*', 
+        'keep recoTracks_ALCARECOTkAlJetHT_*_*',
+        'keep recoTrackExtras_ALCARECOTkAlJetHT_*_*',
+        'keep TrackingRecHitsOwned_ALCARECOTkAlJetHT_*_*',
+        'keep SiPixelClusteredmNewDetSetVector_ALCARECOTkAlJetHT_*_*',
+        'keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlJetHT_*_*',
         'keep L1AcceptBunchCrossings_*_*_*',
         'keep L1GlobalTriggerReadoutRecord_gtDigis_*_*',
         'keep *_TriggerResults_*_*',
@@ -26,5 +30,15 @@
 from Configuration.Eras.Modifier_run3_common_cff import run3_common
 run3_common.toModify(OutALCARECOTkAlJetHT_noDrop, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands)
 
+# in Phase2, remove the SiStrip clusters and keep the OT ones instead
+_phase2_common_removedCommands = OutALCARECOTkAlJetHT_noDrop.outputCommands.copy()
+_phase2_common_removedCommands.remove('keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlJetHT_*_*')
+
+_phase2_common_extraCommands = ['keep Phase2TrackerCluster1DedmNewDetSetVector_ALCARECOTkAlJetHT_*_*']
+
+from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
+phase2_common.toModify(OutALCARECOTkAlJetHT_noDrop, outputCommands = _phase2_common_removedCommands + _phase2_common_extraCommands )
+
+
 OutALCARECOTkAlJetHT = OutALCARECOTkAlJetHT_noDrop.clone()
 OutALCARECOTkAlJetHT.outputCommands.insert(0, "drop *")

Alignment/CommonAlignmentProducer/python/ALCARECOTkAlJpsiMuMuHI_Output_cff.py

@@ -6,7 +6,11 @@
         SelectEvents = cms.vstring('pathALCARECOTkAlJpsiMuMuHI')
     ),
     outputCommands = cms.untracked.vstring(
-        'keep *_ALCARECOTkAlJpsiMuMuHI_*_*', 
+        'keep recoTracks_ALCARECOTkAlJpsiMuMuHI_*_*',
+        'keep recoTrackExtras_ALCARECOTkAlJpsiMuMuHI_*_*',
+        'keep TrackingRecHitsOwned_ALCARECOTkAlJpsiMuMuHI_*_*',
+        'keep SiPixelClusteredmNewDetSetVector_ALCARECOTkAlJpsiMuMuHI_*_*',
+        'keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlJpsiMuMuHI_*_*',
         'keep L1AcceptBunchCrossings_*_*_*',
         'keep L1GlobalTriggerReadoutRecord_gtDigis_*_*',
         'keep *_TriggerResults_*_*',
@@ -24,5 +28,14 @@
 from Configuration.Eras.Modifier_run3_common_cff import run3_common
 run3_common.toModify(OutALCARECOTkAlJpsiMuMuHI_noDrop, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands)
 
+# in Phase2, remove the SiStrip clusters and keep the OT ones instead
+_phase2_common_removedCommands = OutALCARECOTkAlJpsiMuMuHI_noDrop.outputCommands.copy()
+_phase2_common_removedCommands.remove('keep SiStripClusteredmNewDetSetVector_ALCARECOTkAlJpsiMuMuHI_*_*')
+
+_phase2_common_extraCommands = ['keep Phase2TrackerCluster1DedmNewDetSetVector_ALCARECOTkAlJpsiMuMuHI_*_*']
+
+from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
+phase2_common.toModify(OutALCARECOTkAlJpsiMuMuHI_noDrop, outputCommands = _phase2_common_removedCommands + _phase2_common_extraCommands )
+
 OutALCARECOTkAlJpsiMuMuHI = OutALCARECOTkAlJpsiMuMuHI_noDrop.clone()
 OutALCARECOTkAlJpsiMuMuHI.outputCommands.insert(0, "drop *")