Merge pull request cms-sw#10 from threus/apvcycleDBparam-70X

Add changes to the clients which use APVCyclePhaseProducerFromL1TS
nclopezo · Mar 27, 2014 · 9428f20 · 9428f20
2 parents 4ab0457 + 314377e
commit 9428f20
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 18 deletions.
diff --git a/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalZeroBiasHI_cff.py b/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalZeroBiasHI_cff.py
@@ -62,7 +62,7 @@
 
 # Not persistent collections needed by the filters in the AlCaReco DQM
 from DPGAnalysis.SiStripTools.eventwithhistoryproducerfroml1abc_cfi import *
-from DPGAnalysis.SiStripTools.apvcyclephaseproducerfroml1ts2011_cfi import *
+from DPGAnalysis.SiStripTools.apvcyclephaseproducerfroml1tsDB_cfi import *
 
 # SiStripQuality (only to test the different data labels)#
 qualityStatistics = cms.EDAnalyzer("SiStripQualityStatistics",

diff --git a/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalZeroBias_cff.py b/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalZeroBias_cff.py
@@ -56,7 +56,7 @@
 
 # Not persistent collections needed by the filters in the AlCaReco DQM
 from DPGAnalysis.SiStripTools.eventwithhistoryproducerfroml1abc_cfi import *
-from DPGAnalysis.SiStripTools.apvcyclephaseproducerfroml1ts2011_cfi import *
+from DPGAnalysis.SiStripTools.apvcyclephaseproducerfroml1tsDB_cfi import *
 
 # SiStripQuality (only to test the different data labels)#
 qualityStatistics = cms.EDAnalyzer("SiStripQualityStatistics",

diff --git a/DQM/SiStripMonitorClient/python/SiStripSourceConfigTier0_Cosmic_cff.py b/DQM/SiStripMonitorClient/python/SiStripSourceConfigTier0_Cosmic_cff.py
@@ -176,8 +176,8 @@
 # Event History Producer
 from DPGAnalysis.SiStripTools.eventwithhistoryproducerfroml1abc_cfi import *
 
-# APV Phase Producer
-from DPGAnalysis.SiStripTools.apvcyclephaseproducerfroml1ts2011_cfi import *
+# APV Phase Producer (configuration from DB)
+from DPGAnalysis.SiStripTools.apvcyclephaseproducerfroml1tsDB_cfi import *
 
 # Sequences 
 SiStripDQMTier0_cosmicTk = cms.Sequence(APVPhases*consecutiveHEs*SiStripMonitorTrack_cosmicTk*MonitorTrackResiduals_cosmicTk*TrackMon_cosmicTk*TrackEffMon_cosmicTk)

diff --git a/DQM/SiStripMonitorClient/python/SiStripSourceConfigTier0_cff.py b/DQM/SiStripMonitorClient/python/SiStripSourceConfigTier0_cff.py
@@ -115,8 +115,8 @@
 # Event History Producer
 from  DPGAnalysis.SiStripTools.eventwithhistoryproducerfroml1abc_cfi import *
 
-# APV Phase Producer
-from DPGAnalysis.SiStripTools.apvcyclephaseproducerfroml1ts2011_cfi import *
+# APV Phase Producer (configuration from DB)
+from DPGAnalysis.SiStripTools.apvcyclephaseproducerfroml1tsDB_cfi import *
 
 # temporary patch in order to have BXlumi 
 from RecoLuminosity.LumiProducer.lumiProducer_cff import *

diff --git a/DQM/SiStripMonitorCluster/test/MonitorCluster_RealData_cfg.py b/DQM/SiStripMonitorCluster/test/MonitorCluster_RealData_cfg.py
@@ -72,18 +72,19 @@
 process.load("DPGAnalysis.SiStripTools.eventwithhistoryproducerfroml1abc_cfi")
 
 # APV Phase Producer
-#nwe one
-process.load("DPGAnalysis.SiStripTools.apvcyclephaseproducerfroml1ts_cfi")
-APVPhases = cms.EDProducer("APVCyclePhaseProducerFromL1TS",
-                            defaultPartitionNames = cms.vstring("TI",
-                            "TO",
-                            "TP",
-                            "TM"
-                            ),
-                            defaultPhases = cms.vint32(60,60,60,60),
-                            magicOffset = cms.untracked.int32(258),
-                            l1TSCollection = cms.InputTag("scalersRawToDigi"),
-                            )
+from DPGAnalysis.SiStripTools.apvcyclephaseproducerfroml1tsDB_cfi import *
+#new one
+#process.load("DPGAnalysis.SiStripTools.apvcyclephaseproducerfroml1ts_cfi")
+#APVPhases = cms.EDProducer("APVCyclePhaseProducerFromL1TS",
+#                            defaultPartitionNames = cms.vstring("TI",
+#                            "TO",
+#                            "TP",
+#                            "TM"
+#                            ),
+#                            defaultPhases = cms.vint32(60,60,60,60),
+#                            magicOffset = cms.untracked.int32(258),
+#                            l1TSCollection = cms.InputTag("scalersRawToDigi"),
+#                            )
 
 #--------------------------
 # SiStrip MonitorCluster