first bunch

igv4321 · Feb 28, 2014 · 0265150 · 0265150
1 parent 4f7e549
commit 0265150
Show file tree

Hide file tree

Showing 50 changed files with 37 additions and 779 deletions.
diff --git a/DQM/CSCMonitorModule/plugins/CSCDQM_EventProcessor_processEvent.cc b/DQM/CSCMonitorModule/plugins/CSCDQM_EventProcessor_processEvent.cc
@@ -168,17 +168,6 @@ void EventProcessor::processEvent(const char* data, const int32_t dataSize, cons
   bool fGlobal_DCC_DDU_L1A_mismatch_with_CSC_data = false;
   MonitorObject* mo = 0;
 
-  /*
-  // BEWARE! NOT YET UPDATED FOR consumes INTERFACE 29.11.2013 BUT THIS SECTION WAS NOT ACTIVE
-  const edm::InputTag formatStatusCollectionTag("MuonCSCDCCFormatStatusDigi");
-  bool processFormatStatusDigi = true;
-  edm::Handle<CSCDCCFormatStatusDigiCollection> formatStatusColl;
-  if (!e.getByLabel(formatStatusCollectionTag, formatStatusColl)) {
-    LOG_WARN << "No product: " << formatStatusCollectionTag << " in stream";
-    processFormatStatusDigi = false;
-  }
-  */
-
   // run through the DCC's
   for (int id = FEDNumbering::MINCSCFEDID; id <= FEDNumbering::MAXCSCFEDID; ++id)
     {

diff --git a/DQM/CSCMonitorModule/plugins/CSCMonitorModule.cc b/DQM/CSCMonitorModule/plugins/CSCMonitorModule.cc
@@ -95,7 +95,7 @@ void CSCMonitorModule::analyze(const edm::Event& e, const edm::EventSetup& c) {
   if (processDcsScalers) {
     edm::Handle<DcsStatusCollection> dcsStatus;
 #ifdef DQMLOCAL
-    if (e.getByLabel("scalersRawToDigi", dcsStatus)) {
+    if (e.getByToken(dcstoken, dcsStatus)) {
 #endif
 #ifdef DQMGLOBAL
     if (e.getByToken(dcstoken, dcsStatus) ) {

diff --git a/DQM/CastorMonitor/src/CastorMonitorModule.cc b/DQM/CastorMonitor/src/CastorMonitorModule.cc
@@ -596,13 +596,6 @@ void CastorMonitorModule::analyze(const edm::Event& iEvent, const edm::EventSetu
 
  if(rechitOK_)
  {
- //---- get Castor tower collection
- /* 
- edm::ESHandle<reco::CastorTowerCollection> castorTowers; //fix this
- iEvent.getByLabel(inputLabelCastorTowers_,castorTowers); //fix this
-
- TowerJetMon_->processEventTowers(*castorTowers);
- */
  if (showTiming_){
       cpu_timer.stop();
       if (TowerJetMon_!=NULL) std::cout <<"TIMER:: TOWER JET MONITOR ->"<<cpu_timer.cpuTime()<<std::endl;

diff --git a/DQM/L1TMonitor/interface/L1TRCT.h b/DQM/L1TMonitor/interface/L1TRCT.h
@@ -1,37 +1,6 @@
-// -*-C++-*-
 #ifndef L1TRCT_H
 #define L1TRCT_H
 
-/*
- * \file L1TRCT.h
- *
- * \author P. Wittich
- *
- * Revision 1.7  2009/11/19 14:34:14  puigh
- * modify beginJob
- *
- * Revision 1.6  2008/11/08 08:45:42  asavin
- * changing the fine grain to HfPlusTau
- *
- * Revision 1.5  2008/07/02 16:53:20  asavin
- * new L1TRCT.h
- *
- * Revision 1.4  2008/03/01 00:40:00  lat
- * DQM core migration.
- *
- * Revision 1.3  2007/09/03 15:14:42  wittich
- * updated RCT with more diagnostic and local coord histos
- *
- * Revision 1.2  2007/02/23 21:58:43  wittich
- * change getByType to getByLabel and add InputTag
- *
- * Revision 1.1  2007/02/19 22:49:53  wittich
- * - Add RCT monitor
- *
- *
- *
-*/
-
 // system include files
 #include <memory>
 #include <unistd.h>

diff --git a/DQM/L1TMonitor/interface/L1TdeRCT.h b/DQM/L1TMonitor/interface/L1TdeRCT.h
@@ -1,69 +1,6 @@
-// -*-C++-*-
 #ifndef L1TdeRCT_H
 #define L1TdeRCT_H
 
-/*
- * \file L1TdeRCT.h
- *
- * Version 0.0. A.Savin 2008/04/26
- *
- * \author P. Wittich
- *
- * Revision 1.14  2011/10/13 09:29:16  swanson
- * Added exper bit monitoring
- *
- * Revision 1.13  2010/09/30 22:26:45  bachtis
- * Add RCT FED vector monitoring
- *
- * Revision 1.12  2010/03/25 13:46:02  weinberg
- * removed quiet bit information
- *
- * Revision 1.11  2009/11/19 14:35:32  puigh
- * modify beginJob
- *
- * Revision 1.10  2009/10/11 21:12:58  asavin
- * *** empty log message ***
- *
- * Revision 1.9  2008/12/11 09:20:16  asavin
- * efficiency curves in L1TdeRCT
- *
- * Revision 1.8  2008/11/07 15:54:03  weinberg
- * Changed fine grain bit to HF plus tau bit
- *
- * Revision 1.7  2008/09/22 16:48:32  asavin
- * reg1D overeff added
- *
- * Revision 1.6  2008/07/25 13:06:48  weinberg
- * added GCT region/bit information
- *
- * Revision 1.5  2008/06/30 07:34:36  asavin
- * TPGs inculded in the RCT code
- *
- * Revision 1.4  2008/05/06 18:04:02  nuno
- * cruzet update
- *
- * Revision 1.3  2008/05/05 18:42:23  asavin
- * DataOcc added
- *
- * Revision 1.2  2008/05/05 15:01:37  asavin
- * single channel histos are added
- *
- * Revision 1.4  2008/03/01 00:40:00  lat
- * DQM core migration.
- *
- * Revision 1.3  2007/09/03 15:14:42  wittich
- * updated RCT with more diagnostic and local coord histos
- *
- * Revision 1.2  2007/02/23 21:58:43  wittich
- * change getByType to getByLabel and add InputTag
- *
- * Revision 1.1  2007/02/19 22:49:53  wittich
- * - Add RCT monitor
- *
- *
- *
-*/
-
 // system include files
 #include <memory>
 #include <unistd.h>

diff --git a/DQM/L1TMonitor/src/L1TGCT.cc b/DQM/L1TMonitor/src/L1TGCT.cc
@@ -1,177 +1,3 @@
-/*
- * \file L1TGCT.cc
- *
- * \author J. Berryhill
- *
- *
- * Revision 1.55  2010/06/28 09:29:30  tapper
- * Reduced number of bins.
- *
- * Revision 1.54  2010/06/28 06:40:46  tapper
- * Reduced numbers of bins in correlation plots (MET vs MHT and SumET vs HT).
- *
- * Revision 1.53  2010/06/14 20:38:45  tapper
- * Fixed stupid bug in MET vs MHT phi correlation.
- *
- * Revision 1.52  2010/06/09 14:39:27  tapper
- * Fixed labels and binning again.
- *
- * Revision 1.51  2010/06/09 14:03:04  tapper
- * Fixed histogram titles and binning in projections.
- *
- * Revision 1.50  2010/05/30 10:01:59  tapper
- * Added one histogram, correlation of sum ET and HT and changed a few labels for the better.
- *
- * Revision 1.49  2010/04/30 12:50:22  tapper
- * Fixed number of bins and range for MHT phi.
- *
- * Revision 1.48  2010/04/05 11:34:58  tapper
- * Changed scales on 2D HF correlation plots. No idea why they had eta phi scales when they only have 3 bits....
- *
- * Revision 1.47  2010/04/02 16:32:42  tapper
- * 1. Changed GCT unpacker settings to unpack 5 BXs.
- * 2. Changed L1TGCT to plot only central BX distributions but all 5 BXs for timing plots.
- * 3. Made labels more descriptive in GCT emulator expert DQM.
- *
- * Revision 1.46  2009/11/19 14:39:15  puigh
- * modify beginJob
- *
- * Revision 1.45  2009/11/02 22:30:27  tapper
- * Err that'll teach me to test it properly.... fixed a bug in the HF ring histograms.
- *
- * Revision 1.44  2009/11/02 17:00:05  tapper
- * Changes to L1TdeGCT (to include energy sums), to L1TDEMON (should not make any difference now) and L1TGCT to add multiple BXs.
- *
- * Revision 1.43  2009/07/22 19:40:24  puigh
- * Update binning to reflect instrumentation
- *
- * Revision 1.42  2009/06/23 09:48:55  tapper
- * Added missing occupancy plot for central and forward jets.
- *
- * Revision 1.41  2009/06/22 15:58:20  tapper
- * Added MET vs MHT correlation plots (both for magnitude and phi). Still untested!
- *
- * Revision 1.39  2009/05/27 21:49:26  jad
- * updated Total and Missing Energy histograms and added Overlow plots
- *
- * Revision 1.38  2009/02/24 13:01:42  jad
- * Updated MET_PHI histogram to obey the correct limits
- *
- * Revision 1.37  2008/11/11 13:20:32  tapper
- * A whole list of house keeping:
- * 1. New shifter histogram with central and forward jets together.
- * 2. Relabelled Ring 0 and Ring 1 to Ring 1 and Ring 2 for HF rings.
- * 3. Tidied up some histograms names to make all consistent.
- * 4. Switched eta and phi in 2D plots to match RCT.
- * 5. Removed 1D eta and phi plots. Will not be needed for Qtests in future.
- *
- * Revision 1.36  2008/10/28 14:16:16  tapper
- * Tidied up and removed some unnecessary code.
- *
- * Revision 1.35  2008/10/24 08:38:54  jbrooke
- * fix empty jet plots
- *
- * Revision 1.34  2008/10/10 12:41:24  jbrooke
- * put back checks on energy sum vector size, change [] to .at()
- *
- * Revision 1.33  2008/09/21 14:37:51  jad
- * updated HF Sums & Counts and added individual Jet Candidates and differences
- *
- * Revision 1.30  2008/06/09 11:07:52  tapper
- * Removed electron sub-folders with histograms per eta and phi bin.
- *
- * Revision 1.29  2008/06/06 15:18:22  tapper
- * Removed errorSummary folder stuff.
- *
- * Revision 1.28  2008/06/02 11:08:58  tapper
- * Added HF ring histograms....
- *
- * Revision 1.27  2008/05/12 12:52:46  tapper
- * Fixed problem when no GCT data in the event.
- *
- * Revision 1.26  2008/05/09 16:42:27  ameyer
- * *** empty log message ***
- *
- * Revision 1.25  2008/04/29 15:24:49  tapper
- * Changed path to summary histograms.
- *
- * Revision 1.24  2008/04/28 09:23:07  tapper
- * Added 1D eta and phi histograms for electrons and jets as input to Q tests.
- *
- * Revision 1.23  2008/04/25 15:40:21  tapper
- * Added histograms to EventInfo//errorSummarySegments.
- *
- * Revision 1.22  2008/03/20 19:38:25  berryhil
- *
- *
- * organized message logger
- *
- * Revision 1.21  2008/03/14 20:35:46  berryhil
- *
- *
- * stripped out obsolete parameter settings
- *
- * rpc tpg restored with correct dn access and dbe handling
- *
- * Revision 1.20  2008/03/12 17:24:24  berryhil
- *
- *
- * eliminated log files, truncated HCALTPGXana histo output
- *
- * Revision 1.19  2008/03/01 00:40:00  lat
- * DQM core migration.
- *
- * Revision 1.18  2008/02/20 18:59:29  tapper
- * Ported GCTMonitor histograms into L1TGCT
- *
- * Revision 1.17  2008/01/22 18:56:02  muzaffar
- * include cleanup. Only for cc/cpp files
- *
- * Revision 1.16  2007/12/21 17:41:20  berryhil
- *
- *
- * try/catch removal
- *
- * Revision 1.15  2007/11/19 15:08:22  lorenzo
- * changed top folder name
- *
- * Revision 1.14  2007/09/27 23:01:28  ratnik
- * QA campaign: fixes to compensate includes cleanup in  DataFormats/L1Trigger
- *
- * Revision 1.13  2007/09/27 16:56:26  wittich
- * verbosity fixes
- *
- * Revision 1.12  2007/09/26 15:26:23  berryhil
- *
- *
- * restored L1TGCT.cc
- *
- * Revision 1.10  2007/09/05 22:31:36  wittich
- * - Factorize getByLabels to approximate my understanding of what the
- *   HW can do.
- * - tested (loosely speaking) on GREJ' data.
- *
- * Revision 1.9  2007/09/04 02:54:19  wittich
- * - fix dupe ME in RCT
- * - put in rank>0 req in GCT
- * - various small other fixes
- *
- * Revision 1.8  2007/08/31 18:14:21  wittich
- * update GCT packages to reflect GctRawToDigi, and move to raw plots
- *
- * Revision 1.7  2007/08/31 11:02:56  wittich
- * cerr -> LogInfo
- *
- * Revision 1.6  2007/02/22 19:43:53  berryhil
- *
- *
- *
- * InputTag parameters added for all modules
- *
- *
- *
- */
-
 #include "DQM/L1TMonitor/interface/L1TGCT.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "DataFormats/Provenance/interface/EventAuxiliary.h"

diff --git a/DQM/Physics/src/EwkMuDQM.cc b/DQM/Physics/src/EwkMuDQM.cc
@@ -485,24 +485,6 @@ void EwkMuDQM::analyze (const Event & ev, const EventSetup & iSet) {
 
       nmuons_->Fill(muonCollectionSize);
 
-      ////PF Photon Collection
-      //Handle<View<Photon> > pfPhotonCollection;
-      ////Handle<View<pfPhot> > pfPhotonCollection;
-      //if(!ev.getByLabel(pfPhoTag_,pfPhotonCollection)){
-      ////LogError("")
-      //return;
-      //}
-      //unsigned int npfgam=0;
-      //
-      //for (unsigned int i=0; i<pfPhotonCollection->size(); i++){
-      //	const Photon &ph = pfPhotonCollection->at(i);
-      //	double photonPt = ph.pt();
-      //	if (photonPt> ptThrForPhoton_) npfgam++;
-      //  pfphPt_->Fill(photonPt);
-      //	}
-      //npfph_->Fill(npfgam);
-      //LogTrace("") << " >>> N PF photons " << npfgam << std::endl;
-
       // Start counting
       nall++;