fixing applications

DQM/Integration/python/clients/hcal2_dqm_sourceclient-live_cfg.py

@@ -48,9 +48,6 @@
 process.DQMStore.referenceFileName = referenceFileName
 process = customise(process)
 process.DQMStore.verbose = 0
-process.DQM.collectorPort = cms.untracked.int32(9190)
-process.DQM.collectorHost = cms.untracked.string("fu-c2f11-21-03.cms")
-process.dqmSaver.path = "/data/hcaldqm/DQMIO/ONLINE_PLAYBACK"
 
 #	Note, runType is obtained after importing DQM-related modules
 #	=> DQM-dependent

DQM/Integration/python/clients/hcal_dqm_sourceclient-live_cfg.py

@@ -53,7 +53,6 @@
 process.load("Configuration.StandardSequences.GeometryRecoDB_cff")
 process.load('FWCore.MessageLogger.MessageLogger_cfi')
 process.load("EventFilter.HcalRawToDigi.HcalRawToDigi_cfi")
-process.load("RecoLocalCalo.Configuration.hcalLocalReco_cff")
 process.load("SimCalorimetry.HcalTrigPrimProducers.hcaltpdigi_cff")
 
 #-------------------------------------
@@ -77,13 +76,7 @@
 if isHeavyIon:
 	rawTag = cms.InputTag("rawDataRepacker")
 	rawTagUntracked = cms.untracked.InputTag("rawDataRepacker")
-process.essourceSev = cms.ESSource(
-		"EmptyESSource",
-		recordName		= cms.string("HcalSeverityLevelComputerRcd"),
-		firstValid		= cms.vuint32(1),
-		iovIsRunNotTime	= cms.bool(True)
-)
-process.hcalRecAlgos.DropChannelStatusBits = cms.vstring('')
+
 process.emulTPDigis = \
 		process.simHcalTriggerPrimitiveDigis.clone()
 process.emulTPDigis.inputLabel = \
@@ -93,14 +86,12 @@
 process.HcalTPGCoderULUT.LUTGenerationMode = cms.bool(False)
 process.emulTPDigis.FG_threshold = cms.uint32(2)
 process.emulTPDigis.InputTagFEDRaw = rawTag
-process.hbhereco = process.hbheprereco.clone()
 process.hcalDigis.InputLabel = rawTag
 
 #-------------------------------------
-#	Hcal DQM Tasks and Clients import
+#	Hcal DQM Tasks and Harvesters import
 #	New Style
 #-------------------------------------
-process.load("DQM.HcalTasks.RecHitTask")
 process.load("DQM.HcalTasks.DigiTask")
 process.load('DQM.HcalTasks.TPTask')
 process.load('DQM.HcalTasks.RawTask')
@@ -111,10 +102,11 @@
 #	Will not be here for Online DQM
 #-------------------------------------
 if useMap:
-    process.GlobalTag.toGet.append(cms.PSet(record = cms.string("HcalElectronicsMapRcd"),
-                                            tag = cms.string("HcalElectronicsMap_v7.05_hlt"),
-                                            )
-                                   )
+    process.GlobalTag.toGet.append(cms.PSet(
+		record = cms.string("HcalElectronicsMapRcd"),
+        tag = cms.string("HcalElectronicsMap_v7.05_hlt"),
+        )
+	)
 
 #-------------------------------------
 #	For Debugginb
@@ -131,17 +123,14 @@
 process.digiTask.runkeyName = runTypeName
 process.rawTask.runkeyVal = runType
 process.rawTask.runkeyName = runTypeName
-process.recHitTask.runkeyVal = runType
-process.recHitTask.runkeyName = runTypeName
 process.tpTask.runkeyVal = runType
 process.tpTask.runkeyName = runTypeName
 
 #-------------------------------------
 #	Hcal DQM Tasks/Clients Sequences Definition
 #-------------------------------------
 process.tasksSequence = cms.Sequence(
-		process.recHitTask
-		+process.rawTask
+		process.rawTask
 		+process.digiTask
 		+process.tpTask
 )
@@ -168,13 +157,7 @@
 #-------------------------------------
 process.preRecoSequence = cms.Sequence(
 		process.hcalDigis
-)
-
-process.recoSequence = cms.Sequence(
-		process.emulTPDigis
-		+process.hfreco
-		+process.hbhereco
-		+process.horeco
+		*process.emulTPDigis
 )
 
 process.dqmSequence = cms.Sequence(
@@ -184,7 +167,6 @@
 
 process.p = cms.Path(
 		process.preRecoSequence
-		*process.recoSequence
 		*process.tasksSequence
 		*process.harvestingSequence
 		*process.dqmSequence