Update configs

cms-sw · Sep 6, 2018 · 344b209 · 344b209
1 parent b5eed9a
commit 344b209
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 15 deletions.
diff --git a/RecoLocalTracker/SiStripZeroSuppression/python/SiStripMergeZeroSuppression_cfi.py b/RecoLocalTracker/SiStripZeroSuppression/python/SiStripMergeZeroSuppression_cfi.py
@@ -0,0 +1,9 @@
+import FWCore.ParameterSet.Config as cms
+
+from RecoLocalTracker.SiStripZeroSuppression.DefaultAlgorithms_cff import *
+
+siStripMergeZeroSuppression = cms.EDProducer("SiStripMergeZeroSuppression",
+    Algorithms     = DefaultAlgorithms,
+    DigisToMergeZS = cms.InputTag('siStripDigis','ZeroSuppressed'),
+    DigisToMergeVR = cms.InputTag('siStripVRDigis','VirginRaw'),
+)
diff --git a/RecoLocalTracker/SiStripZeroSuppression/python/SiStripZeroSuppression_SimData_cfi.py b/RecoLocalTracker/SiStripZeroSuppression/python/SiStripZeroSuppression_SimData_cfi.py
@@ -8,9 +8,6 @@
     RawDigiProducersList = cms.VInputTag( cms.InputTag('simSiStripDigis','VirginRaw'), 
                                           cms.InputTag('simSiStripDigis','ProcessedRaw'),
                                           cms.InputTag('simSiStripDigis','ScopeMode')),
-
-    DigisToMergeZS = cms.InputTag('siStripDigis','ZeroSuppressed'),
-    DigisToMergeVR = cms.InputTag('siStripVRDigis','VirginRaw'),
 
     storeCM = cms.bool(False), 
     fixCM= cms.bool(False),                # put -999 into CM collection for "inspected" APV
@@ -19,8 +16,6 @@
     produceCalculatedBaseline = cms.bool(False),
     produceBaselinePoints = cms.bool(False),
     storeInZScollBadAPV = cms.bool(True),
-    mergeCollections = cms.bool(False),
-
 )
 
 

diff --git a/RecoLocalTracker/SiStripZeroSuppression/python/SiStripZeroSuppression_cfi.py b/RecoLocalTracker/SiStripZeroSuppression/python/SiStripZeroSuppression_cfi.py
@@ -10,22 +10,14 @@
                                           cms.InputTag('siStripDigis','ScopeMode')),
                                        #   cms.InputTag('siStripDigis','ZeroSuppressed')),
 
-
-    DigisToMergeZS = cms.InputTag('siStripDigis','ZeroSuppressed'),
-    DigisToMergeVR = cms.InputTag('siStripVRDigis','VirginRaw'),
-
-
     storeCM = cms.bool(True), 
     fixCM= cms.bool(False),                # put -999 into CM collection for "inspected" APV
 
-    produceRawDigis = cms.bool(True),     # if mergeCollection is True, produceRawDigi is not considered
+    produceRawDigis = cms.bool(True),
     produceCalculatedBaseline = cms.bool(False),
     produceBaselinePoints = cms.bool(False),
     storeInZScollBadAPV = cms.bool(True), # it selects if in the ZS collection the bad APVs are written. To be kept for ZS
-    mergeCollections = cms.bool(False),
     produceHybridFormat = cms.bool(False)
-
-
 )
 
 # The SiStripClusters are not used anymore in phase2 tracking

diff --git a/RecoLocalTracker/SiStripZeroSuppression/test/SiStripZS_EmulateHybrid_RealData.py b/RecoLocalTracker/SiStripZeroSuppression/test/SiStripZS_EmulateHybrid_RealData.py
@@ -65,7 +65,7 @@
 process.siStripZeroSuppression.produceBaselinePoints = cms.bool(False)
 process.siStripZeroSuppression.storeCM = cms.bool(True)
 process.siStripZeroSuppression.produceHybridFormat = cms.bool(True)
-process.siStripZeroSuppression.HybridInputDigis = cms.InputTag('','')
+process.siStripZeroSuppression.Algorithms.APVInspectMode = cms.string("HybridEmulation")
 process.siStripZeroSuppression.Algorithms.CommonModeNoiseSubtractionMode = cms.string('Median')
 process.siStripZeroSuppression.Algorithms.MeanCM = cms.int32(512)
 process.siStripZeroSuppression.Algorithms.DeltaCMThreshold = cms.uint32(20)