cms-sw · davidlange6 · Feb 26, 2016 · Feb 18, 2016 · Feb 19, 2016 · Feb 19, 2016
diff --git a/DPGAnalysis/Skims/interface/PhysDecl.h b/DPGAnalysis/Skims/interface/PhysDecl.h
@@ -24,6 +24,8 @@
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
+#include "DataFormats/Common/interface/TriggerResults.h"
+#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutRecord.h"
 
 //
 // class declaration
@@ -42,7 +44,8 @@ class PhysDecl : public edm::EDFilter {
   bool debugOn;
   bool init_;
   std::vector<std::string>  hlNames_;  // name of each HLT algorithm
-  edm::InputTag hlTriggerResults_;
+  edm::EDGetTokenT<edm::TriggerResults> hlTriggerResults_;
+  edm::EDGetTokenT<L1GlobalTriggerReadoutRecord> gtDigis_;
 };
 
 #endif
diff --git a/DPGAnalysis/Skims/src/PhysDecl.cc b/DPGAnalysis/Skims/src/PhysDecl.cc
@@ -34,7 +34,8 @@ PhysDecl::PhysDecl(const edm::ParameterSet& iConfig)
 {
   applyfilter = iConfig.getUntrackedParameter<bool>("applyfilter",true);
   debugOn     = iConfig.getUntrackedParameter<bool>("debugOn",false);
-  hlTriggerResults_ = iConfig.getParameter<edm::InputTag> ("HLTriggerResults");
+  hlTriggerResults_ = consumes<TriggerResults>(iConfig.getParameter<edm::InputTag> ("HLTriggerResults"));
+  gtDigis_ = consumes<L1GlobalTriggerReadoutRecord>(iConfig.getUntrackedParameter<edm::InputTag> ("gtDigis",edm::InputTag("gtDigis")));
   init_ = false;
 }
 
@@ -55,7 +56,7 @@ bool PhysDecl::filter( edm::Event& iEvent, const edm::EventSetup& iSetup)
 
   //hlt info
   edm::Handle<TriggerResults> HLTR;
-  iEvent.getByLabel(hlTriggerResults_,HLTR);
+  iEvent.getByToken(hlTriggerResults_,HLTR);
 
   if(HLTR.isValid())
     {
@@ -83,7 +84,7 @@ bool PhysDecl::filter( edm::Event& iEvent, const edm::EventSetup& iSetup)
   // trigger info
 
   edm::Handle<L1GlobalTriggerReadoutRecord> gtrr_handle;
-  iEvent.getByLabel("gtDigis", gtrr_handle);
+  iEvent.getByToken(gtDigis_, gtrr_handle);
   L1GlobalTriggerReadoutRecord const* gtrr = gtrr_handle.product();
 
   L1GtFdlWord fdlWord = gtrr->gtFdlWord();

diff --git a/DQM/HcalCommon/interface/Axis.h b/DQM/HcalCommon/interface/Axis.h
@@ -64,6 +64,9 @@ namespace hcaldqm
 				Axis(std::string title,AxisType type, AxisQType qtype, 
 					int n, double min, double max, bool log=false);
 				virtual ~Axis() {}
+				virtual Axis* makeCopy()
+				{return new Axis(_title, _type, _qtype, _nbins,
+					_min, _max, _log);}
 
 				//	getters of Value to put
 				virtual int get(HcalDetId const&) {return 0;}

diff --git a/DQM/HcalCommon/interface/ContainerSingle1D.h b/DQM/HcalCommon/interface/ContainerSingle1D.h
@@ -26,6 +26,7 @@ namespace hcaldqm
 				std::string const& nametitle, 
 				axis::Axis *xaxis,
 				axis::Axis *yaxis = new ValueAxis(fYaxis, axis::fEntries));
+			ContainerSingle1D(ContainerSingle1D const&);
 			virtual ~ContainerSingle1D();
 
 			virtual void initialize(std::string const& folder, 

diff --git a/DQM/HcalCommon/interface/CoordinateAxis.h b/DQM/HcalCommon/interface/CoordinateAxis.h
@@ -117,6 +117,8 @@ namespace hcaldqm
 					int n, double min, double max, std::string title, 
 					bool log=false);
 				virtual ~CoordinateAxis() {}
+				virtual CoordinateAxis* makeCopy()
+				{return new CoordinateAxis(_type, _ctype, _log);}
 
 				virtual int get(HcalDetId const&);
 				virtual int get(HcalElectronicsId const&);

diff --git a/DQM/HcalCommon/interface/FlagAxis.h b/DQM/HcalCommon/interface/FlagAxis.h
@@ -42,6 +42,8 @@ namespace hcaldqm
 				FlagAxis();
 				FlagAxis(AxisType,  std::string, int);
 				virtual ~FlagAxis() {}
+				virtual FlagAxis* makeCopy()
+				{return new FlagAxis(_type, _title, _nbins);}
 
 				virtual inline int getBin(int v) {return v+1;}
 

diff --git a/DQM/HcalCommon/interface/ValueAxis.h b/DQM/HcalCommon/interface/ValueAxis.h
@@ -95,6 +95,8 @@ namespace hcaldqm
 				ValueAxis(AxisType type, ValueType vtype, int n, 
 					double min,	double max, std::string title, bool log=false);
 				virtual ~ValueAxis() {}
+				virtual ValueAxis* makeCopy()
+				{return new ValueAxis(_type, _vtype, _log);}
 
 				virtual int getBin(int);
 				virtual int getBin(double);

diff --git a/DQM/HcalCommon/src/ContainerSingle1D.cc b/DQM/HcalCommon/src/ContainerSingle1D.cc
@@ -24,6 +24,13 @@ namespace hcaldqm
 		_xaxis(xaxis), _yaxis(yaxis)
 	{}
 
+	ContainerSingle1D::ContainerSingle1D(ContainerSingle1D const& c):
+		Container(c._folder, c._name)
+	{
+		_xaxis = c._xaxis->makeCopy();
+		_yaxis = c._yaxis->makeCopy();
+	}
+
 	/* virtual */ void ContainerSingle1D::initialize(std::string const& folder,
 		std::string const& nametitle,
 		Axis *xaxis, Axis *yaxis, int debug/*=0*/)

diff --git a/DQM/HcalCommon/src/DQTask.cc b/DQM/HcalCommon/src/DQTask.cc
@@ -26,32 +26,15 @@ namespace hcaldqm
 	/* virtual */ void DQTask::analyze(edm::Event const& e,
 		edm::EventSetup const& es)
 	{
-		try
-		{
-			this->_resetMonitors(fEvent);
-			_logger.debug(_name+" processing");
-			if (!this->_isApplicable(e))
-				return;
-
-			_evsTotal++; _cEvsTotal.fill(_evsTotal);
-			_evsPerLS++; _cEvsPerLS.fill(_evsPerLS);
-			_currentLS = e.luminosityBlock();
-			this->_process(e, es);
-		}
-		catch (cms::Exception &exc)
-		{
-			_logger.warn("We have cms::Exception Triggered. " +
-				std::string(exc.what()));
-		}
-		catch (std::exception &exc)
-		{
-			_logger.warn("we have STD Exception Triggered. " +
-				std::string(exc.what()));
-		}
-		catch (...)
-		{
-			_logger.warn("Unknown Exception Triggered");
-		}
+		this->_resetMonitors(fEvent);
+		_logger.debug(_name+" processing");
+		if (!this->_isApplicable(e))
+			return;
+
+		_evsTotal++; _cEvsTotal.fill(_evsTotal);
+		_evsPerLS++; _cEvsPerLS.fill(_evsPerLS);
+		_currentLS = e.luminosityBlock();
+		this->_process(e, es);
 	}
 
 	/* virtual */ void DQTask::bookHistograms(DQMStore::IBooker &ib,

diff --git a/DQM/HcalTasks/plugins/TPTask.cc b/DQM/HcalTasks/plugins/TPTask.cc
@@ -230,6 +230,11 @@ TPTask::TPTask(edm::ParameterSet const& ps):
 		int soiEt_d = hddigi->SOI_compressedEt();
 		int soiFG_d = hddigi->SOI_fineGrain() ? 1 : 0;
 		HcalTrigTowerDetId tid = hddigi->id();
+		//	NOTE: skip1x1 should've done that - in the emap it's depth10
+		//	in data in 80X it's 0 for some reason!!!
+		//	skip using version number
+		if (tid.version()>0)
+			continue;
 
 		//	tmp
 		if (hddigi->id().depth()==1)

diff --git a/DQM/HcalTasks/python/OfflineSourceSequence_cosmic.py b/DQM/HcalTasks/python/OfflineSourceSequence_cosmic.py
@@ -31,9 +31,9 @@
 #	set the Emulator label for TP Task
 tpTask.tagEmul = cms.untracked.InputTag("valHcalTriggerPrimitiveDigis")
 
+#	no TP Task for Cosmics
 hcalOfflineSourceSequence = cms.Sequence(
 	digiTask
-	+tpTask
 	+recHitTask
 	+rawTask)
 
diff --git a/DQM/Integration/python/clients/castor_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/castor_dqm_sourceclient-live_cfg.py
@@ -27,113 +27,38 @@
 #============================================
 # Castor Conditions: from Global Conditions Tag 
 #============================================
-process.load("CondCore.DBCommon.CondDBSetup_cfi")
-process.load("CondCore.DBCommon.CondDBCommon_cfi")
+process.load("DQM.Integration.config.FrontierCondition_GT_cfi")
+#FIXME: they should use an official GT, not define custom records and conditions on their own!!!
+process.GlobalTag.toGet = cms.VPSet( cms.PSet( record = cms.string('CastorGainsRcd'),
+                                               tag = cms.string('CastorGains_v2.1_hlt'), 
+                                               ),
+                                     cms.PSet( record = cms.string('CastorSaturationCorrsRcd'),
+                                               tag = cms.string('CastorSaturationCorrs_v3.00_offline'),
+                                               ),
+                                     cms.PSet( record = cms.string('CastorPedestalWidthsRcd'),
+                                               tag = cms.string('CastorPedestalWidths_v3.00_offline'),
+                                               ),
+                                     cms.PSet( record = cms.string('CastorGainWidthsRcd'),
+                                               tag = cms.string('CastorGainWidths_v3.00_offline'),
+                                               ),
+                                     cms.PSet( record = cms.string('CastorQIEDataRcd'),
+                                               tag = cms.string('CastorQIEData_v3.00_offline'),
+                                               ),
+                                     cms.PSet( record = cms.string('CastorChannelQualityRcd'),
+                                               tag = cms.string('CastorChannelQuality_v3.00_offline'),
+                                               ),
+                                     cms.PSet( record = cms.string('CastorElectronicsMapRcd'),
+                                               tag = cms.string('CastorElectronicsMap_v3.00_offline'),
+                                               ),
+                                      )
 
 process.CastorDbProducer = cms.ESProducer("CastorDbProducer")
 
-###process.es_pool = cms.ESSource(
-###   "PoolDBESSource",
-###   process.CondDBSetup,
-###   timetype = cms.string('runnumber'),
-###   connect = cms.string('frontier://(proxyurl=http://localhost:3128)(serverurl=http://localhost:8000/FrontierOnProd)(serverurl=http://localhost:8000/FrontierOn Prod)(retrieve-ziplevel=0)(failovertoserver=no)/CMS_COND_31X_HCAL'),
-###   authenticationMethod = cms.untracked.uint32(0),
-###   toGet = cms.VPSet(
-###       cms.PSet(
-###           record = cms.string('CastorPedestalsRcd'),
-###           tag = cms.string('castor_pedestals_v1.0')
-###           ),
-###       cms.PSet(
-###           record = cms.string('CastorPedestalWidthsRcd'),
-###           tag = cms.string('castor_pedestalwidths_v1.0')
-###           ),
-###       cms.PSet(
-###           record = cms.string('CastorGainsRcd'),
-###           tag = cms.string('castor_gains_v1.0')
-###           ),
-###       cms.PSet(
-###           record = cms.string('CastorGainWidthsRcd'),
-###           tag = cms.string('castor_gainwidths_v1.0')
-###           ),
-###       cms.PSet(
-###           record = cms.string('CastorQIEDataRcd'),
-###           tag = cms.string('castor_qie_v1.0')
-###           ),
-###       cms.PSet(
-###           record = cms.string('CastorChannelQualityRcd'),
-###           tag = cms.string('castor_channelquality_v1.0')
-###           ),
-###       cms.PSet(
-###           record = cms.string('CastorElectronicsMapRcd'),
-###           tag = cms.string('castor_emap_dcc_v1.0')
-###           )
-###   )
-###)
-
-process.es_pool0 = cms.ESSource(
-   "PoolDBESSource",
-   process.CondDBSetup,
-   timetype = cms.string('runnumber'),
-   ###connect = cms.string('frontier://FrontierProd/CMS_COND_31X_HCAL'),
-   connect = cms.string('frontier://(proxyurl=http://localhost:3128)(serverurl=http://localhost:8000/FrontierOnProd)(serverurl=http://localhost:8000/FrontierOn Prod)(retrieve-ziplevel=0)(failovertoserver=no)/CMS_COND_31X_HCAL'),
-   authenticationMethod = cms.untracked.uint32(0),
-   toGet = cms.VPSet(
-       cms.PSet(
-           record = cms.string('CastorGainsRcd'),
-           tag = cms.string('CastorGains_v2.1_hlt') #all gains=1, corresponding to GR_P_V43D and CastorGains_v2.1_hlt in frontier://PromptProd/CMS_COND_31X_HCAL
-           )
-   )
-)
-
-process.es_pool = cms.ESSource(
-   "PoolDBESSource",
-   process.CondDBSetup,
-   timetype = cms.string('runnumber'),
-   #connect = cms.string('frontier://cmsfrontier.cern.ch:8000/FrontierPrep/CMS_COND_30X_HCAL'),
-   #connect = cms.string('frontier://cmsfrontier.cern.ch:8000/FrontierProd/CMS_COND_31X_HCAL'),
-   ###connect = cms.string('frontier://FrontierProd/CMS_COND_HCAL_000'),
-   connect = cms.string('frontier://(proxyurl=http://localhost:3128)(serverurl=http://localhost:8000/FrontierOnProd)(serverurl=http://localhost:8000/FrontierOn Prod)(retrieve-ziplevel=0)(failovertoserver=no)/CMS_COND_HCAL_000'),
-   authenticationMethod = cms.untracked.uint32(0),
-   toGet = cms.VPSet(
-       cms.PSet(
-           record = cms.string('CastorSaturationCorrsRcd'),
-           tag = cms.string('CastorSaturationCorrs_v3.00_offline')
-           ),
-#
-       cms.PSet(
-           record = cms.string('CastorPedestalsRcd'),
-           tag = cms.string('CastorPedestals_v3.00_offline')
-           ),
-#
-       cms.PSet(
-           record = cms.string('CastorPedestalWidthsRcd'),
-           tag = cms.string('CastorPedestalWidths_v3.00_offline')
-           ),
-#
-#       cms.PSet(
-#           record = cms.string('CastorGainsRcd'),
-#           tag = cms.string('CastorGains_v3.00_offline')
-#           ),
-#
-       cms.PSet(
-           record = cms.string('CastorGainWidthsRcd'),
-           tag = cms.string('CastorGainWidths_v3.00_offline')
-           ),
-       cms.PSet(
-           record = cms.string('CastorQIEDataRcd'),
-           tag = cms.string('CastorQIEData_v3.00_offline')
-           ),
-       cms.PSet(
-           record = cms.string('CastorChannelQualityRcd'),
-           tag = cms.string('CastorChannelQuality_v3.00_offline')
-           ),
-       cms.PSet(
-           record = cms.string('CastorElectronicsMapRcd'),
-           tag = cms.string('CastorElectronicsMap_v3.00_offline')
-           )
-   )
-)
-
+##most likely the real fix:
+#process.load("DQM.Integration.config.FrontierCondition_GT_cfi")
+## Condition for lxplus: change and possibly customise the GT
+#from Configuration.AlCa.GlobalTag import GlobalTag as gtCustomise
+#process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run2_data', '')
 
 #-----------------------------
 # Castor DQM Source + SimpleReconstrctor

diff --git a/DQM/Integration/python/clients/ecal_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/ecal_dqm_sourceclient-live_cfg.py
@@ -5,9 +5,10 @@
 
 ### Load cfis ###
 
-process.load("Geometry.CaloEventSetup.CaloGeometry_cfi")
-process.load("Geometry.CaloEventSetup.CaloTopology_cfi")
-process.load("Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi")
+process.load("Configuration.StandardSequences.GeometryRecoDB_cff")
+#process.load("Geometry.CaloEventSetup.CaloGeometry_cfi")
+#process.load("Geometry.CaloEventSetup.CaloTopology_cfi")
+#process.load("Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi")
 process.load("Geometry.CMSCommonData.cmsIdealGeometryXML_cfi")
 process.load("Geometry.EcalMapping.EcalMapping_cfi")
 process.load("Geometry.EcalMapping.EcalMappingRecord_cfi")
@@ -125,12 +126,10 @@
 process.GlobalTag.toGet = cms.VPSet(cms.PSet(
     record = cms.string('EcalDQMChannelStatusRcd'),
     tag = cms.string('EcalDQMChannelStatus_v1_hlt'),
-    connect = cms.string('frontier://(proxyurl=http://frontier.cms:3128)(serverurl=http://frontier.cms:8000/FrontierOnProd)(serverurl=http://frontier.cms:8000/FrontierOnProd)(retrieve-ziplevel=0)(failovertoserver=no)/CMS_COND_34X_ECAL')
 ), 
     cms.PSet(
         record = cms.string('EcalDQMTowerStatusRcd'),
         tag = cms.string('EcalDQMTowerStatus_v1_hlt'),
-        connect = cms.string('frontier://(proxyurl=http://frontier.cms:3128)(serverurl=http://frontier.cms:8000/FrontierOnProd)(serverurl=http://frontier.cms:8000/FrontierOnProd)(retrieve-ziplevel=0)(failovertoserver=no)/CMS_COND_34X_ECAL')
     ))
 
 process.preScaler.prescaleFactor = 1

diff --git a/DQM/Integration/python/clients/ecalcalib_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/ecalcalib_dqm_sourceclient-live_cfg.py
@@ -5,9 +5,10 @@
 
 ### Load cfis ###
 
-process.load("Geometry.CaloEventSetup.CaloGeometry_cfi")
-process.load("Geometry.CaloEventSetup.CaloTopology_cfi")
-process.load("Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi")
+process.load("Configuration.StandardSequences.GeometryRecoDB_cff")
+#process.load("Geometry.CaloEventSetup.CaloGeometry_cfi")
+#process.load("Geometry.CaloEventSetup.CaloTopology_cfi")
+#process.load("Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi")
 process.load("Geometry.CMSCommonData.cmsIdealGeometryXML_cfi")
 process.load("Geometry.EcalMapping.EcalMapping_cfi")
 process.load("Geometry.EcalMapping.EcalMappingRecord_cfi")
@@ -170,12 +171,10 @@
 process.GlobalTag.toGet = cms.VPSet(cms.PSet(
     record = cms.string('EcalDQMChannelStatusRcd'),
     tag = cms.string('EcalDQMChannelStatus_v1_hlt'),
-    connect = cms.string('frontier://(proxyurl=http://frontier.cms:3128)(serverurl=http://frontier.cms:8000/FrontierOnProd)(serverurl=http://frontier.cms:8000/FrontierOnProd)(retrieve-ziplevel=0)(failovertoserver=no)/CMS_COND_34X_ECAL')
 ), 
     cms.PSet(
         record = cms.string('EcalDQMTowerStatusRcd'),
         tag = cms.string('EcalDQMTowerStatus_v1_hlt'),
-        connect = cms.string('frontier://(proxyurl=http://frontier.cms:3128)(serverurl=http://frontier.cms:8000/FrontierOnProd)(serverurl=http://frontier.cms:8000/FrontierOnProd)(retrieve-ziplevel=0)(failovertoserver=no)/CMS_COND_34X_ECAL')
     ))
 
 process.ecalTestPulseMonitorTask.verbosity = 0