diff --git a/[refs] b/[refs]
index 5c9ea10ecf6a0..8a2e76d1b00ce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,3 +1,3 @@
 ---
 refs/heads/gh-pages: 09c786f70121f131b3715aaf3464996502bbeb7e
-"refs/heads/CMSSW_7_1_X": 8ccfdd091a5be573bcf69baf4b1257f7c4736328
+"refs/heads/CMSSW_7_1_X": 91efbf9ca89ba7c90359e466b25bcbfd8c954d1f
diff --git a/trunk/DQM/SiStripCommissioningDbClients/interface/ApvTimingHistosUsingDb.h b/trunk/DQM/SiStripCommissioningDbClients/interface/ApvTimingHistosUsingDb.h
index 04e07d3a5f426..742d1a92d30c6 100644
--- a/trunk/DQM/SiStripCommissioningDbClients/interface/ApvTimingHistosUsingDb.h
+++ b/trunk/DQM/SiStripCommissioningDbClients/interface/ApvTimingHistosUsingDb.h
@@ -1,4 +1,4 @@
-// Last commit: $Id: ApvTimingHistosUsingDb.h,v 1.10 2008/05/06 12:38:06 bainbrid Exp $
+// Last commit: $Id: ApvTimingHistosUsingDb.h,v 1.11 2009/06/18 20:52:35 lowette Exp $
 
 #ifndef DQM_SiStripCommissioningClients_ApvTimingHistosUsingDb_H
 #define DQM_SiStripCommissioningClients_ApvTimingHistosUsingDb_H
@@ -10,13 +10,9 @@ class ApvTimingHistosUsingDb : public CommissioningHistosUsingDb, public ApvTimi
   
  public:
 
-  ApvTimingHistosUsingDb( const edm::ParameterSet & pset,
-                          DQMOldReceiver*,
-			  SiStripConfigDb* const );
-
   ApvTimingHistosUsingDb( const edm::ParameterSet & pset,
                           DQMStore*,
-			  SiStripConfigDb* const );
+                          SiStripConfigDb* const );
 
   virtual ~ApvTimingHistosUsingDb();
   
diff --git a/trunk/DQM/SiStripCommissioningDbClients/interface/CalibrationHistosUsingDb.h b/trunk/DQM/SiStripCommissioningDbClients/interface/CalibrationHistosUsingDb.h
index 54f67b1af9c02..dfcdfb7bfc699 100644
--- a/trunk/DQM/SiStripCommissioningDbClients/interface/CalibrationHistosUsingDb.h
+++ b/trunk/DQM/SiStripCommissioningDbClients/interface/CalibrationHistosUsingDb.h
@@ -1,4 +1,4 @@
-// Last commit: $Id: CalibrationHistosUsingDb.h,v 1.5 2008/05/06 12:38:06 bainbrid Exp $
+// Last commit: $Id: CalibrationHistosUsingDb.h,v 1.6 2009/06/18 20:52:35 lowette Exp $
 
 #ifndef DQM_SiStripCommissioningClients_CalibrationHistosUsingDb_H
 #define DQM_SiStripCommissioningClients_CalibrationHistosUsingDb_H
@@ -16,15 +16,10 @@ class CalibrationHistosUsingDb : public CommissioningHistosUsingDb, public Calib
   
  public:
   
-  CalibrationHistosUsingDb( const edm::ParameterSet & pset,
-                            DQMOldReceiver*,
-			    SiStripConfigDb* const,
-			    const sistrip::RunType& task = sistrip::CALIBRATION );
-  
   CalibrationHistosUsingDb( const edm::ParameterSet & pset,
                             DQMStore*,
-			    SiStripConfigDb* const,
-			    const sistrip::RunType& task = sistrip::CALIBRATION );
+                            SiStripConfigDb* const,
+                            const sistrip::RunType& task = sistrip::CALIBRATION );
 
   virtual ~CalibrationHistosUsingDb();
 
diff --git a/trunk/DQM/SiStripCommissioningDbClients/interface/CommissioningHistosUsingDb.h b/trunk/DQM/SiStripCommissioningDbClients/interface/CommissioningHistosUsingDb.h
index 3f358c4e6a831..2b3e24f489838 100644
--- a/trunk/DQM/SiStripCommissioningDbClients/interface/CommissioningHistosUsingDb.h
+++ b/trunk/DQM/SiStripCommissioningDbClients/interface/CommissioningHistosUsingDb.h
@@ -1,4 +1,4 @@
-// Last commit: $Id: CommissioningHistosUsingDb.h,v 1.12 2009/05/29 12:58:18 bainbrid Exp $
+// Last commit: $Id: CommissioningHistosUsingDb.h,v 1.13 2009/05/29 13:28:21 bainbrid Exp $
 
 #ifndef DQM_SiStripCommissioningClients_CommissioningHistosUsingDb_H
 #define DQM_SiStripCommissioningClients_CommissioningHistosUsingDb_H
@@ -13,26 +13,18 @@
 
 class SiStripConfigDb;
 class SiStripFedCabling;
-class DQMOldReceiver;
 
 class CommissioningHistosUsingDb : public virtual CommissioningHistograms {
   
- public:
+ // ---------- public interface ----------
 
-  // ---------- con(de)structors ----------
+ public:
 
-  // DEPRECATE
   CommissioningHistosUsingDb( SiStripConfigDb* const,
-			      sistrip::RunType = sistrip::UNDEFINED_RUN_TYPE );
+                              sistrip::RunType = sistrip::UNDEFINED_RUN_TYPE );
 
-  CommissioningHistosUsingDb( SiStripConfigDb* const,
-			      DQMOldReceiver* const,			      
-			      sistrip::RunType = sistrip::UNDEFINED_RUN_TYPE );
-  
   virtual ~CommissioningHistosUsingDb();
 
-  // ---------- public interface ----------
-  
   void uploadToConfigDb();
   
   bool doUploadAnal() const;
@@ -51,7 +43,7 @@ class CommissioningHistosUsingDb : public virtual CommissioningHistograms {
   
   void disableBadStrips( bool );
   
-  // ---------- protected methods ----------
+ // ---------- protected methods ----------
 
  protected:
   
@@ -90,7 +82,7 @@ class CommissioningHistosUsingDb : public virtual CommissioningHistograms {
   
   void disableProblemDevices();
   
-  // ---------- private member data ----------
+ // ---------- private member data ----------
   
  private: 
   
diff --git a/trunk/DQM/SiStripCommissioningDbClients/interface/FastFedCablingHistosUsingDb.h b/trunk/DQM/SiStripCommissioningDbClients/interface/FastFedCablingHistosUsingDb.h
index 1591f3d61ce5f..1affdf7ec4630 100644
--- a/trunk/DQM/SiStripCommissioningDbClients/interface/FastFedCablingHistosUsingDb.h
+++ b/trunk/DQM/SiStripCommissioningDbClients/interface/FastFedCablingHistosUsingDb.h
@@ -1,4 +1,4 @@
-// Last commit: $Id: FastFedCablingHistosUsingDb.h,v 1.7 2008/05/06 12:38:06 bainbrid Exp $
+// Last commit: $Id: FastFedCablingHistosUsingDb.h,v 1.8 2009/06/18 20:52:35 lowette Exp $
 
 #ifndef DQM_SiStripCommissioningClients_FastFedCablingHistosUsingDb_H
 #define DQM_SiStripCommissioningClients_FastFedCablingHistosUsingDb_H
@@ -10,13 +10,9 @@ class FastFedCablingHistosUsingDb : public CommissioningHistosUsingDb, public Fa
   
  public:
   
-  FastFedCablingHistosUsingDb( const edm::ParameterSet & pset,
-                               DQMOldReceiver*,
-			       SiStripConfigDb* const );
-
   FastFedCablingHistosUsingDb( const edm::ParameterSet & pset,
                                DQMStore*,
-			       SiStripConfigDb* const );
+                               SiStripConfigDb* const );
 
   virtual ~FastFedCablingHistosUsingDb();
  
@@ -27,16 +23,16 @@ class FastFedCablingHistosUsingDb : public CommissioningHistosUsingDb, public Fa
  private:
   
   void update( SiStripConfigDb::FedConnectionsV&,
-	       SiStripConfigDb::FedDescriptionsRange,
-	       SiStripConfigDb::DeviceDescriptionsRange, 
-	       SiStripConfigDb::DcuDetIdsRange );
+               SiStripConfigDb::FedDescriptionsRange,
+               SiStripConfigDb::DeviceDescriptionsRange, 
+               SiStripConfigDb::DcuDetIdsRange );
   
   void update( SiStripConfigDb::FedDescriptionsRange );
   
   void create( SiStripConfigDb::AnalysisDescriptionsV&, Analysis ); 
   
   void connections( SiStripConfigDb::DeviceDescriptionsRange, 
-		    SiStripConfigDb::DcuDetIdsRange );
+                    SiStripConfigDb::DcuDetIdsRange );
   
 };
 
diff --git a/trunk/DQM/SiStripCommissioningDbClients/interface/FineDelayHistosUsingDb.h b/trunk/DQM/SiStripCommissioningDbClients/interface/FineDelayHistosUsingDb.h
index 09af1e41ffc03..9b7bec14539d7 100644
--- a/trunk/DQM/SiStripCommissioningDbClients/interface/FineDelayHistosUsingDb.h
+++ b/trunk/DQM/SiStripCommissioningDbClients/interface/FineDelayHistosUsingDb.h
@@ -1,4 +1,4 @@
-// Last commit: $Id: FineDelayHistosUsingDb.h,v 1.9 2008/11/25 18:21:33 delaer Exp $
+// Last commit: $Id: FineDelayHistosUsingDb.h,v 1.10 2009/06/18 20:52:35 lowette Exp $
 
 #ifndef DQM_SiStripCommissioningClients_FineDelayHistosUsingDb_H
 #define DQM_SiStripCommissioningClients_FineDelayHistosUsingDb_H
@@ -16,18 +16,14 @@ class FineDelayHistosUsingDb : public CommissioningHistosUsingDb, public Samplin
   
  public:
   
-  FineDelayHistosUsingDb( const edm::ParameterSet & pset,
-                          DQMOldReceiver*,
-			  SiStripConfigDb* const );
-  
   FineDelayHistosUsingDb( const edm::ParameterSet & pset,
                           DQMStore*,
-			  SiStripConfigDb* const );
+                          SiStripConfigDb* const );
 
   virtual ~FineDelayHistosUsingDb();
 
   virtual void configure( const edm::ParameterSet&, 
-			  const edm::EventSetup& );
+                          const edm::EventSetup& );
 
   virtual void uploadConfigurations();
 
diff --git a/trunk/DQM/SiStripCommissioningDbClients/interface/LatencyHistosUsingDb.h b/trunk/DQM/SiStripCommissioningDbClients/interface/LatencyHistosUsingDb.h
index c2542c01b89b5..214de6aa1f7cb 100644
--- a/trunk/DQM/SiStripCommissioningDbClients/interface/LatencyHistosUsingDb.h
+++ b/trunk/DQM/SiStripCommissioningDbClients/interface/LatencyHistosUsingDb.h
@@ -1,4 +1,4 @@
-// Last commit: $Id: LatencyHistosUsingDb.h,v 1.8 2008/11/10 14:33:58 delaer Exp $
+// Last commit: $Id: LatencyHistosUsingDb.h,v 1.9 2009/06/18 20:52:35 lowette Exp $
 
 #ifndef DQM_SiStripCommissioningClients_LatencyHistosUsingDb_H
 #define DQM_SiStripCommissioningClients_LatencyHistosUsingDb_H
@@ -14,13 +14,9 @@ class LatencyHistosUsingDb : public CommissioningHistosUsingDb, public SamplingH
   
  public:
   
-  LatencyHistosUsingDb( const edm::ParameterSet & pset,
-                        DQMOldReceiver*,
-			SiStripConfigDb* const );
-  
   LatencyHistosUsingDb( const edm::ParameterSet & pset,
                         DQMStore*,
-			SiStripConfigDb* const );
+                        SiStripConfigDb* const );
   
   virtual ~LatencyHistosUsingDb();
   
@@ -31,11 +27,12 @@ class LatencyHistosUsingDb : public CommissioningHistosUsingDb, public SamplingH
  private:
   
   bool update( SiStripConfigDb::DeviceDescriptionsRange, 
-	       SiStripConfigDb::FedDescriptionsRange );
+               SiStripConfigDb::FedDescriptionsRange );
   
   void create( SiStripConfigDb::AnalysisDescriptionsV&, Analysis );
   
   bool perPartition_;
+
 };
 
 #endif // DQM_SiStripCommissioningClients_LatencyHistosUsingDb_H
diff --git a/trunk/DQM/SiStripCommissioningDbClients/interface/NoiseHistosUsingDb.h b/trunk/DQM/SiStripCommissioningDbClients/interface/NoiseHistosUsingDb.h
index dd609bb0e4989..6c1308c871ef0 100644
--- a/trunk/DQM/SiStripCommissioningDbClients/interface/NoiseHistosUsingDb.h
+++ b/trunk/DQM/SiStripCommissioningDbClients/interface/NoiseHistosUsingDb.h
@@ -1,4 +1,4 @@
-// Last commit: $Id: NoiseHistosUsingDb.h,v 1.2 2008/05/06 12:38:06 bainbrid Exp $
+// Last commit: $Id: NoiseHistosUsingDb.h,v 1.3 2009/06/18 20:52:35 lowette Exp $
 
 #ifndef DQM_SiStripCommissioningClients_NoiseHistosUsingDb_H
 #define DQM_SiStripCommissioningClients_NoiseHistosUsingDb_H
@@ -10,13 +10,9 @@ class NoiseHistosUsingDb : public CommissioningHistosUsingDb, public NoiseHistog
   
  public:
 
-  NoiseHistosUsingDb( const edm::ParameterSet & pset,
-                      DQMOldReceiver*,
-		      SiStripConfigDb* const );
-  
   NoiseHistosUsingDb( const edm::ParameterSet & pset,
                       DQMStore*,
-		      SiStripConfigDb* const );
+                      SiStripConfigDb* const );
   
   virtual ~NoiseHistosUsingDb();
  
diff --git a/trunk/DQM/SiStripCommissioningDbClients/interface/OptoScanHistosUsingDb.h b/trunk/DQM/SiStripCommissioningDbClients/interface/OptoScanHistosUsingDb.h
index 0e47b8583a3dc..f3dc3a1a14a3e 100644
--- a/trunk/DQM/SiStripCommissioningDbClients/interface/OptoScanHistosUsingDb.h
+++ b/trunk/DQM/SiStripCommissioningDbClients/interface/OptoScanHistosUsingDb.h
@@ -1,4 +1,4 @@
-// Last commit: $Id: OptoScanHistosUsingDb.h,v 1.11 2009/06/18 20:52:35 lowette Exp $
+// Last commit: $Id: OptoScanHistosUsingDb.h,v 1.12 2009/10/09 09:27:06 lowette Exp $
 
 #ifndef DQM_SiStripCommissioningClients_OptoScanHistosUsingDb_H
 #define DQM_SiStripCommissioningClients_OptoScanHistosUsingDb_H
@@ -10,13 +10,9 @@ class OptoScanHistosUsingDb : public CommissioningHistosUsingDb, public OptoScan
   
  public:
   
-  OptoScanHistosUsingDb( const edm::ParameterSet & pset,
-                         DQMOldReceiver*,
-			 SiStripConfigDb* const );
-  
   OptoScanHistosUsingDb( const edm::ParameterSet & pset,
                          DQMStore*,
-			 SiStripConfigDb* const );
+                         SiStripConfigDb* const );
 
   virtual ~OptoScanHistosUsingDb();
 
diff --git a/trunk/DQM/SiStripCommissioningDbClients/interface/PedestalsHistosUsingDb.h b/trunk/DQM/SiStripCommissioningDbClients/interface/PedestalsHistosUsingDb.h
index 7def88a0f61ff..435b1d17a1dc9 100644
--- a/trunk/DQM/SiStripCommissioningDbClients/interface/PedestalsHistosUsingDb.h
+++ b/trunk/DQM/SiStripCommissioningDbClients/interface/PedestalsHistosUsingDb.h
@@ -1,4 +1,4 @@
-// Last commit: $Id: PedestalsHistosUsingDb.h,v 1.10 2009/06/18 20:52:35 lowette Exp $
+// Last commit: $Id: PedestalsHistosUsingDb.h,v 1.11 2009/10/09 09:27:06 lowette Exp $
 
 #ifndef DQM_SiStripCommissioningClients_PedestalsHistosUsingDb_H
 #define DQM_SiStripCommissioningClients_PedestalsHistosUsingDb_H
@@ -10,13 +10,9 @@ class PedestalsHistosUsingDb : public CommissioningHistosUsingDb, public Pedesta
   
  public:
   
-  PedestalsHistosUsingDb( const edm::ParameterSet & pset,
-                          DQMOldReceiver*,
-			  SiStripConfigDb* const );
-  
   PedestalsHistosUsingDb( const edm::ParameterSet & pset,
                           DQMStore*,
-			  SiStripConfigDb* const );
+                          SiStripConfigDb* const );
   
   virtual ~PedestalsHistosUsingDb();
   
diff --git a/trunk/DQM/SiStripCommissioningDbClients/interface/PedsFullNoiseHistosUsingDb.h b/trunk/DQM/SiStripCommissioningDbClients/interface/PedsFullNoiseHistosUsingDb.h
index ae0bae4d07d66..c9b4e596b346b 100644
--- a/trunk/DQM/SiStripCommissioningDbClients/interface/PedsFullNoiseHistosUsingDb.h
+++ b/trunk/DQM/SiStripCommissioningDbClients/interface/PedsFullNoiseHistosUsingDb.h
@@ -1,4 +1,4 @@
-// Last commit: $Id: PedsFullNoiseHistosUsingDb.h,v 1.10 2009/06/18 20:52:35 lowette Exp $
+// Last commit: $Id: PedsFullNoiseHistosUsingDb.h,v 1.1 2009/11/03 17:48:16 wto Exp $
 
 #ifndef DQM_SiStripCommissioningClients_PedsFullNoiseHistosUsingDb_H
 #define DQM_SiStripCommissioningClients_PedsFullNoiseHistosUsingDb_H
@@ -10,12 +10,10 @@ class PedsFullNoiseHistosUsingDb : public CommissioningHistosUsingDb, public Ped
 
   public:
 
-    PedsFullNoiseHistosUsingDb( const edm::ParameterSet & pset,
-                                DQMOldReceiver*,
-                                SiStripConfigDb* const );
     PedsFullNoiseHistosUsingDb( const edm::ParameterSet & pset,
                                 DQMStore*,
                                 SiStripConfigDb* const );
+
     virtual ~PedsFullNoiseHistosUsingDb();
 
     virtual void uploadConfigurations();
diff --git a/trunk/DQM/SiStripCommissioningDbClients/interface/PedsOnlyHistosUsingDb.h b/trunk/DQM/SiStripCommissioningDbClients/interface/PedsOnlyHistosUsingDb.h
index 13f4b963f2546..c1c318519dd48 100644
--- a/trunk/DQM/SiStripCommissioningDbClients/interface/PedsOnlyHistosUsingDb.h
+++ b/trunk/DQM/SiStripCommissioningDbClients/interface/PedsOnlyHistosUsingDb.h
@@ -1,4 +1,4 @@
-// Last commit: $Id: PedsOnlyHistosUsingDb.h,v 1.2 2008/05/06 12:38:06 bainbrid Exp $
+// Last commit: $Id: PedsOnlyHistosUsingDb.h,v 1.3 2009/06/18 20:52:35 lowette Exp $
 
 #ifndef DQM_SiStripCommissioningClients_PedsOnlyHistosUsingDb_H
 #define DQM_SiStripCommissioningClients_PedsOnlyHistosUsingDb_H
@@ -10,13 +10,9 @@ class PedsOnlyHistosUsingDb : public CommissioningHistosUsingDb, public PedsOnly
   
  public:
 
-  PedsOnlyHistosUsingDb( const edm::ParameterSet & pset,
-                         DQMOldReceiver*,
-			 SiStripConfigDb* const );
-  
   PedsOnlyHistosUsingDb( const edm::ParameterSet & pset,
                          DQMStore*,
-			 SiStripConfigDb* const );
+                         SiStripConfigDb* const );
   
   virtual ~PedsOnlyHistosUsingDb();
  
diff --git a/trunk/DQM/SiStripCommissioningDbClients/interface/SamplingHistosUsingDb.h b/trunk/DQM/SiStripCommissioningDbClients/interface/SamplingHistosUsingDb.h
index e93dba24c10e8..9582e24b9a1ba 100644
--- a/trunk/DQM/SiStripCommissioningDbClients/interface/SamplingHistosUsingDb.h
+++ b/trunk/DQM/SiStripCommissioningDbClients/interface/SamplingHistosUsingDb.h
@@ -1,4 +1,4 @@
-// Last commit: $Id: SamplingHistosUsingDb.h,v 1.2 2008/05/06 12:38:06 bainbrid Exp $
+// Last commit: $Id: SamplingHistosUsingDb.h,v 1.3 2009/06/18 20:52:35 lowette Exp $
 
 #ifndef DQM_SiStripCommissioningClients_SamplingHistosUsingDb_H
 #define DQM_SiStripCommissioningClients_SamplingHistosUsingDb_H
@@ -14,13 +14,9 @@ class SamplingHistosUsingDb : public CommissioningHistosUsingDb, public Sampling
   
  public:
   
-  SamplingHistosUsingDb( const edm::ParameterSet & pset,
-                         MonitorUserInterface*,
-			 SiStripConfigDb* const );
-  
   SamplingHistosUsingDb( const edm::ParameterSet & pset,
                          DaqMonitorBEInterface*,
-			 SiStripConfigDb* const );
+                         SiStripConfigDb* const );
 
   virtual ~SamplingHistosUsingDb();
 
diff --git a/trunk/DQM/SiStripCommissioningDbClients/interface/VpspScanHistosUsingDb.h b/trunk/DQM/SiStripCommissioningDbClients/interface/VpspScanHistosUsingDb.h
index ed13b169b8df8..34be11f2d8619 100644
--- a/trunk/DQM/SiStripCommissioningDbClients/interface/VpspScanHistosUsingDb.h
+++ b/trunk/DQM/SiStripCommissioningDbClients/interface/VpspScanHistosUsingDb.h
@@ -1,4 +1,4 @@
-// Last commit: $Id: VpspScanHistosUsingDb.h,v 1.8 2008/05/06 12:38:06 bainbrid Exp $
+// Last commit: $Id: VpspScanHistosUsingDb.h,v 1.9 2009/06/18 20:52:35 lowette Exp $
 
 #ifndef DQM_SiStripCommissioningClients_VpspScanHistosUsingDb_H
 #define DQM_SiStripCommissioningClients_VpspScanHistosUsingDb_H
@@ -10,13 +10,9 @@ class VpspScanHistosUsingDb : public CommissioningHistosUsingDb, public VpspScan
   
  public:
   
-  VpspScanHistosUsingDb( const edm::ParameterSet & pset,
-                         DQMOldReceiver*,
-			 SiStripConfigDb* const );
-  
   VpspScanHistosUsingDb( const edm::ParameterSet & pset,
                          DQMStore*,
-			 SiStripConfigDb* const );
+                         SiStripConfigDb* const );
 
   virtual ~VpspScanHistosUsingDb();
 
diff --git a/trunk/DQM/SiStripCommissioningDbClients/plugins/SiStripCommissioningOfflineDbClient.cc b/trunk/DQM/SiStripCommissioningDbClients/plugins/SiStripCommissioningOfflineDbClient.cc
index 36f049cfd2a16..5867ee62a6d89 100644
--- a/trunk/DQM/SiStripCommissioningDbClients/plugins/SiStripCommissioningOfflineDbClient.cc
+++ b/trunk/DQM/SiStripCommissioningDbClients/plugins/SiStripCommissioningOfflineDbClient.cc
@@ -1,4 +1,4 @@
-// Last commit: $Id: SiStripCommissioningOfflineDbClient.cc,v 1.21 2009/06/18 20:52:36 lowette Exp $
+// Last commit: $Id: SiStripCommissioningOfflineDbClient.cc,v 1.22 2009/11/03 17:48:16 wto Exp $
 
 #include "DQM/SiStripCommissioningDbClients/plugins/SiStripCommissioningOfflineDbClient.h"
 #include "DataFormats/SiStripCommon/interface/SiStripEnumsAndStrings.h"
@@ -15,10 +15,9 @@
 #include "DQM/SiStripCommissioningDbClients/interface/LatencyHistosUsingDb.h"
 #include "DQM/SiStripCommissioningDbClients/interface/FineDelayHistosUsingDb.h"
 #include "DQM/SiStripCommissioningDbClients/interface/CalibrationHistosUsingDb.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "DQMServices/Core/interface/DQMStore.h"
-#include "DQMServices/Core/interface/DQMOldReceiver.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "OnlineDB/SiStripConfigDb/interface/SiStripConfigDb.h"
 
 using namespace sistrip;
@@ -73,17 +72,9 @@ void SiStripCommissioningOfflineDbClient::createHistos( const edm::ParameterSet&
     return;
   } 
 
-  // Check pointer to MUI
-  if ( !mui_ ) {
-    edm::LogError(mlDqmClient_)
-      << "[SiStripCommissioningOfflineDbClient::" << __func__ << "]"
-      << " NULL pointer to DQMOldReceiver!";
-    return;
-  }
-
   // Check pointer to BEI
-  DQMStore* bei = mui_->getBEInterface();
-  if ( !bei ) {
+  // is this needed here? bei_ = edm::Service<DQMStore>().operator->();
+  if ( !bei_ ) {
     edm::LogError(mlDqmClient_)
       << "[SiStripCommissioningOfflineDbClient::" << __func__ << "]"
       << " NULL pointer to DQMStore!";
@@ -108,21 +99,21 @@ void SiStripCommissioningOfflineDbClient::createHistos( const edm::ParameterSet&
   } 
   
   // Create corresponding "commissioning histograms" object 
-  if      ( runType_ == sistrip::FAST_CABLING ) { histos_ = new FastFedCablingHistosUsingDb( pset, mui_, db ); }
-  else if ( runType_ == sistrip::APV_TIMING )   { histos_ = new ApvTimingHistosUsingDb( pset, mui_, db ); }
-  else if ( runType_ == sistrip::OPTO_SCAN )    { histos_ = new OptoScanHistosUsingDb( pset, mui_, db ); }
-  else if ( runType_ == sistrip::VPSP_SCAN )    { histos_ = new VpspScanHistosUsingDb( pset, mui_, db ); }
-  else if ( runType_ == sistrip::PEDESTALS )    { histos_ = new PedestalsHistosUsingDb( pset, mui_, db ); }
-  else if ( runType_ == sistrip::PEDS_ONLY )    { histos_ = new PedsOnlyHistosUsingDb( pset, mui_, db ); }
-  else if ( runType_ == sistrip::PEDS_FULL_NOISE ) { histos_ = new PedsFullNoiseHistosUsingDb( pset, mui_, db ); }
-  else if ( runType_ == sistrip::NOISE )        { histos_ = new NoiseHistosUsingDb( pset, mui_, db ); }
-  else if ( runType_ == sistrip::APV_LATENCY )  { histos_ = new LatencyHistosUsingDb( pset, mui_, db ); }
-  else if ( runType_ == sistrip::FINE_DELAY )   { histos_ = new FineDelayHistosUsingDb( pset, mui_, db ); }
+  if      ( runType_ == sistrip::FAST_CABLING ) { histos_ = new FastFedCablingHistosUsingDb( pset, bei_, db ); }
+  else if ( runType_ == sistrip::APV_TIMING )   { histos_ = new ApvTimingHistosUsingDb( pset, bei_, db ); }
+  else if ( runType_ == sistrip::OPTO_SCAN )    { histos_ = new OptoScanHistosUsingDb( pset, bei_, db ); }
+  else if ( runType_ == sistrip::VPSP_SCAN )    { histos_ = new VpspScanHistosUsingDb( pset, bei_, db ); }
+  else if ( runType_ == sistrip::PEDESTALS )    { histos_ = new PedestalsHistosUsingDb( pset, bei_, db ); }
+  else if ( runType_ == sistrip::PEDS_ONLY )    { histos_ = new PedsOnlyHistosUsingDb( pset, bei_, db ); }
+  else if ( runType_ == sistrip::PEDS_FULL_NOISE ) { histos_ = new PedsFullNoiseHistosUsingDb( pset, bei_, db ); }
+  else if ( runType_ == sistrip::NOISE )        { histos_ = new NoiseHistosUsingDb( pset, bei_, db ); }
+  else if ( runType_ == sistrip::APV_LATENCY )  { histos_ = new LatencyHistosUsingDb( pset, bei_, db ); }
+  else if ( runType_ == sistrip::FINE_DELAY )   { histos_ = new FineDelayHistosUsingDb( pset, bei_, db ); }
   else if ( runType_ == sistrip::CALIBRATION ||
             runType_ == sistrip::CALIBRATION_DECO ||
             runType_ == sistrip::CALIBRATION_SCAN ||
             runType_ == sistrip::CALIBRATION_SCAN_DECO)
-                                                { histos_ = new CalibrationHistosUsingDb( pset, mui_, db, runType_ ); }
+                                                { histos_ = new CalibrationHistosUsingDb( pset, bei_, db, runType_ ); }
   else if ( runType_ == sistrip::UNDEFINED_RUN_TYPE ) { 
     histos_ = 0; 
     edm::LogError(mlDqmClient_)
diff --git a/trunk/DQM/SiStripCommissioningDbClients/src/ApvTimingHistosUsingDb.cc b/trunk/DQM/SiStripCommissioningDbClients/src/ApvTimingHistosUsingDb.cc
index db2e2cef3a8a1..ce542d9e0414a 100644
--- a/trunk/DQM/SiStripCommissioningDbClients/src/ApvTimingHistosUsingDb.cc
+++ b/trunk/DQM/SiStripCommissioningDbClients/src/ApvTimingHistosUsingDb.cc
@@ -1,4 +1,4 @@
-// Last commit: $Id: ApvTimingHistosUsingDb.cc,v 1.26 2009/06/18 20:52:36 lowette Exp $
+// Last commit: $Id: ApvTimingHistosUsingDb.cc,v 1.27 2009/07/13 22:38:55 lowette Exp $
 
 #include "DQM/SiStripCommissioningDbClients/interface/ApvTimingHistosUsingDb.h"
 #include "CondFormats/SiStripObjects/interface/ApvTimingAnalysis.h"
@@ -13,30 +13,12 @@ using namespace sistrip;
 // -----------------------------------------------------------------------------
 /** */
 ApvTimingHistosUsingDb::ApvTimingHistosUsingDb( const edm::ParameterSet & pset,
-                                                DQMOldReceiver* mui,
-						SiStripConfigDb* const db ) 
+                                                DQMStore* bei,
+                                                SiStripConfigDb* const db ) 
   : CommissioningHistograms( pset.getParameter<edm::ParameterSet>("ApvTimingParameters"),
-                             mui,
+                             bei,
                              sistrip::APV_TIMING ),
     CommissioningHistosUsingDb( db,
-                                mui,
-                                sistrip::APV_TIMING ),
-    ApvTimingHistograms( pset.getParameter<edm::ParameterSet>("ApvTimingParameters"),
-                         mui ),
-    uploadFecSettings_(true),
-    uploadFedSettings_(true)
-{
-  LogTrace(mlDqmClient_) 
-    << "[ApvTimingHistosUsingDb::" << __func__ << "]"
-    << " Constructing object...";
-}
-
-// -----------------------------------------------------------------------------
-/** */
-ApvTimingHistosUsingDb::ApvTimingHistosUsingDb( const edm::ParameterSet & pset,
-                                                DQMStore* bei,
-						SiStripConfigDb* const db ) 
-  : CommissioningHistosUsingDb( db,
                                 sistrip::APV_TIMING ),
     ApvTimingHistograms( pset.getParameter<edm::ParameterSet>("ApvTimingParameters"),
                          bei ),
diff --git a/trunk/DQM/SiStripCommissioningDbClients/src/CalibrationHistosUsingDb.cc b/trunk/DQM/SiStripCommissioningDbClients/src/CalibrationHistosUsingDb.cc
index 92822def6f906..af11c5ac1edf3 100644
--- a/trunk/DQM/SiStripCommissioningDbClients/src/CalibrationHistosUsingDb.cc
+++ b/trunk/DQM/SiStripCommissioningDbClients/src/CalibrationHistosUsingDb.cc
@@ -1,4 +1,4 @@
-// Last commit: $Id: CalibrationHistosUsingDb.cc,v 1.10 2009/04/06 16:52:42 lowette Exp $
+// Last commit: $Id: CalibrationHistosUsingDb.cc,v 1.11 2009/06/18 20:52:36 lowette Exp $
 
 #include "DQM/SiStripCommissioningDbClients/interface/CalibrationHistosUsingDb.h"
 #include "CondFormats/SiStripObjects/interface/CalibrationAnalysis.h"
@@ -17,61 +17,16 @@ std::string getBasePath (const std::string &path)
   return path.substr(0,path.find(std::string(sistrip::root_) + "/")+sizeof(sistrip::root_) );
 }
 
-CalibrationHistosUsingDb::CalibrationHistosUsingDb( const edm::ParameterSet & pset,
-                                                    DQMOldReceiver* mui,
-						    SiStripConfigDb* const db,
-						    const sistrip::RunType& task )
-  : CommissioningHistograms( pset.getParameter<edm::ParameterSet>("CalibrationParameters"),
-                             mui,
-                             task ),
-    CommissioningHistosUsingDb( db,
-                                mui,
-                                task ),
-    CalibrationHistograms( pset.getParameter<edm::ParameterSet>("CalibrationParameters"),
-                           mui,
-                           task )
-{
-  LogTrace(mlDqmClient_) 
-    << "[CalibrationHistosUsingDb::" << __func__ << "]"
-    << " Constructing object...";
-  // Load and dump the current ISHA/VFS values. This is used by the standalone analysis script
-  const SiStripConfigDb::DeviceDescriptionsRange & apvDescriptions = db->getDeviceDescriptions(APV25);
-  for(SiStripConfigDb::DeviceDescriptionsV::const_iterator apv = apvDescriptions.begin();apv!=apvDescriptions.end();++apv) {
-    apvDescription* desc = dynamic_cast<apvDescription*>( *apv );
-    if ( !desc ) { continue; }
-    // Retrieve device addresses from device description
-    const SiStripConfigDb::DeviceAddress& addr = db->deviceAddress(*desc);
-    std::stringstream bin;
-    bin        << std::setw(1) << std::setfill('0') << addr.fecCrate_;
-    bin << "." << std::setw(2) << std::setfill('0') << addr.fecSlot_;
-    bin << "." << std::setw(1) << std::setfill('0') << addr.fecRing_;
-    bin << "." << std::setw(3) << std::setfill('0') << addr.ccuAddr_;
-    bin << "." << std::setw(2) << std::setfill('0') << addr.ccuChan_;
-    bin << "." << desc->getAddress();
-    LogTrace(mlDqmClient_) << "Present values for ISHA/VFS of APV " 
-			   << bin.str() << " : " 
-			   << static_cast<uint16_t>(desc->getIsha()) << " " << static_cast<uint16_t>(desc->getVfs());
-  }
-  // Load the histograms with the results
-  std::string pwd = bei()->pwd();
-  std::string ishaPath = getBasePath(pwd);
-  ishaPath += "/ControlView/isha";
-  LogTrace(mlDqmClient_) << "Looking for " << ishaPath;
-  ishaHistogram_ = ExtractTObject<TH1F>().extract( bei()->get(ishaPath) );
-  std::string vfsPath = getBasePath(pwd);
-  vfsPath += "/ControlView/vfs";
-  LogTrace(mlDqmClient_) << "Looking for " << vfsPath;
-  vfsHistogram_ = ExtractTObject<TH1F>().extract( bei()->get(vfsPath) );
-
-}
-
 // -----------------------------------------------------------------------------
 /** */
 CalibrationHistosUsingDb::CalibrationHistosUsingDb( const edm::ParameterSet & pset,
                                                     DQMStore* bei,
-						    SiStripConfigDb* const db,
-						    const sistrip::RunType& task ) 
-  : CommissioningHistosUsingDb( db,
+                                                    SiStripConfigDb* const db,
+                                                    const sistrip::RunType& task ) 
+  : CommissioningHistograms( pset.getParameter<edm::ParameterSet>("CalibrationParameters"),
+                             bei,
+                             task ),
+    CommissioningHistosUsingDb( db,
                                 task ),
     CalibrationHistograms( pset.getParameter<edm::ParameterSet>("CalibrationParameters"),
                            bei,
diff --git a/trunk/DQM/SiStripCommissioningDbClients/src/CommissioningHistosUsingDb.cc b/trunk/DQM/SiStripCommissioningDbClients/src/CommissioningHistosUsingDb.cc
index 267f1c87c68aa..b152a23d8cdba 100644
--- a/trunk/DQM/SiStripCommissioningDbClients/src/CommissioningHistosUsingDb.cc
+++ b/trunk/DQM/SiStripCommissioningDbClients/src/CommissioningHistosUsingDb.cc
@@ -1,4 +1,4 @@
-// Last commit: $Id: CommissioningHistosUsingDb.cc,v 1.18 2009/06/18 20:52:37 lowette Exp $
+// Last commit: $Id: CommissioningHistosUsingDb.cc,v 1.19 2009/07/13 23:14:46 lowette Exp $
 
 #include "DQM/SiStripCommissioningDbClients/interface/CommissioningHistosUsingDb.h"
 #include "CalibFormats/SiStripObjects/interface/NumberOfDevices.h"
@@ -7,7 +7,6 @@
 #include "CondFormats/SiStripObjects/interface/FedChannelConnection.h"
 #include "CondFormats/SiStripObjects/interface/SiStripFedCabling.h"
 #include "DataFormats/SiStripCommon/interface/SiStripEnumsAndStrings.h"
-#include "DQMServices/Core/interface/DQMOldReceiver.h"
 #include "OnlineDB/SiStripConfigDb/interface/SiStripConfigDb.h"
 #include "OnlineDB/SiStripESSources/interface/SiStripFedCablingBuilderFromDb.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
@@ -18,7 +17,7 @@ using namespace sistrip;
 // -----------------------------------------------------------------------------
 /** */
 CommissioningHistosUsingDb::CommissioningHistosUsingDb( SiStripConfigDb* const db,
-							sistrip::RunType type )
+                                                        sistrip::RunType type )
   : CommissioningHistograms(),
     runType_(type),
     db_(db),
@@ -59,55 +58,10 @@ CommissioningHistosUsingDb::CommissioningHistosUsingDb( SiStripConfigDb* const d
   
 }
 
-// -----------------------------------------------------------------------------
-/** */
-CommissioningHistosUsingDb::CommissioningHistosUsingDb( SiStripConfigDb* const db,
-							DQMOldReceiver* const mui,
-							sistrip::RunType type )
-  : CommissioningHistograms( edm::ParameterSet(), mui, type ),
-    runType_(type),
-    db_(db),
-    cabling_(0),
-    detInfo_(),
-    disabled_(),
-    uploadAnal_(true),
-    uploadConf_(false),
-    disableDevices_(false),
-    disableBadStrips_(false)
-{
-  LogTrace(mlDqmClient_) 
-    << "[" << __PRETTY_FUNCTION__ << "]"
-    << " Constructing object...";
-  
-  // Build FEC cabling object from connections found in DB
-  SiStripFecCabling fec_cabling;
-  if ( runType_ == sistrip::FAST_CABLING ) {
-    SiStripFedCablingBuilderFromDb::buildFecCablingFromDevices( db_, fec_cabling );
-  } else {
-    SiStripFedCablingBuilderFromDb::buildFecCabling( db_, fec_cabling );
-  }
-  
-  // Build FED cabling from FEC cabling
-  cabling_ = new SiStripFedCabling();
-  SiStripFedCablingBuilderFromDb::getFedCabling( fec_cabling, *cabling_ );
-  std::stringstream ss;
-  ss << "[CommissioningHistosUsingDb::" << __func__ << "]"
-     << " Terse print out of FED cabling:" << std::endl;
-  cabling_->terse(ss);
-  LogTrace(mlDqmClient_) << ss.str();
-  
-  std::stringstream sss;
-  sss << "[CommissioningHistosUsingDb::" << __func__ << "]"
-      << " Summary of FED cabling:" << std::endl;
-  cabling_->summary(sss);
-  edm::LogVerbatim(mlDqmClient_) << sss.str();
-  
-}
-
 // -----------------------------------------------------------------------------
 /** */
 CommissioningHistosUsingDb::CommissioningHistosUsingDb()
-  : CommissioningHistograms( edm::ParameterSet(), reinterpret_cast<DQMOldReceiver*>(0), sistrip::UNDEFINED_RUN_TYPE ),
+  : CommissioningHistograms(),
     runType_(sistrip::UNDEFINED_RUN_TYPE),
     db_(0),
     cabling_(0),
diff --git a/trunk/DQM/SiStripCommissioningDbClients/src/FastFedCablingHistosUsingDb.cc b/trunk/DQM/SiStripCommissioningDbClients/src/FastFedCablingHistosUsingDb.cc
index b0ca1ba7f7626..7f190a6e7f664 100644
--- a/trunk/DQM/SiStripCommissioningDbClients/src/FastFedCablingHistosUsingDb.cc
+++ b/trunk/DQM/SiStripCommissioningDbClients/src/FastFedCablingHistosUsingDb.cc
@@ -1,4 +1,4 @@
-// Last commit: $Id: FastFedCablingHistosUsingDb.cc,v 1.21 2009/04/06 16:52:42 lowette Exp $
+// Last commit: $Id: FastFedCablingHistosUsingDb.cc,v 1.22 2009/06/18 20:52:37 lowette Exp $
 
 #include "DQM/SiStripCommissioningDbClients/interface/FastFedCablingHistosUsingDb.h"
 #include "CondFormats/SiStripObjects/interface/FastFedCablingAnalysis.h"
@@ -12,28 +12,12 @@ using namespace sistrip;
 // -----------------------------------------------------------------------------
 /** */
 FastFedCablingHistosUsingDb::FastFedCablingHistosUsingDb( const edm::ParameterSet & pset,
-                                                          DQMOldReceiver* mui,
-							  SiStripConfigDb* const db ) 
+                                                          DQMStore* bei,
+                                                          SiStripConfigDb* const db ) 
   : CommissioningHistograms( pset.getParameter<edm::ParameterSet>("FastFedCablingParameters"),
-                             mui,
+                             bei,
                              sistrip::FAST_CABLING ),
     CommissioningHistosUsingDb( db,
-                                mui,
-                                sistrip::FAST_CABLING ),
-    FastFedCablingHistograms( pset.getParameter<edm::ParameterSet>("FastFedCablingParameters"),
-                              mui )
-{
-  LogTrace(mlDqmClient_)
-    << "[FastFedCablingHistosUsingDb::" << __func__ << "]"
-    << " Constructing object...";
-}
-
-// -----------------------------------------------------------------------------
-/** */
-FastFedCablingHistosUsingDb::FastFedCablingHistosUsingDb( const edm::ParameterSet & pset,
-                                                          DQMStore* bei,
-							  SiStripConfigDb* const db ) 
-  : CommissioningHistosUsingDb( db,
                                 sistrip::FAST_CABLING ),
     FastFedCablingHistograms( pset.getParameter<edm::ParameterSet>("FastFedCablingParameters"),
                               bei )
diff --git a/trunk/DQM/SiStripCommissioningDbClients/src/FineDelayHistosUsingDb.cc b/trunk/DQM/SiStripCommissioningDbClients/src/FineDelayHistosUsingDb.cc
index 29286090e7b3d..bc7664dc6ab54 100644
--- a/trunk/DQM/SiStripCommissioningDbClients/src/FineDelayHistosUsingDb.cc
+++ b/trunk/DQM/SiStripCommissioningDbClients/src/FineDelayHistosUsingDb.cc
@@ -1,4 +1,4 @@
-// Last commit: $Id: FineDelayHistosUsingDb.cc,v 1.16 2009/09/04 09:36:08 lowette Exp $
+// Last commit: $Id: FineDelayHistosUsingDb.cc,v 1.17 2009/11/02 18:52:51 lowette Exp $
 
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
@@ -22,34 +22,16 @@ using namespace sistrip;
 // -----------------------------------------------------------------------------
 /** */
 FineDelayHistosUsingDb::FineDelayHistosUsingDb( const edm::ParameterSet & pset,
-                                                DQMOldReceiver* mui,
-						SiStripConfigDb* const db )
+                                                DQMStore* bei,
+                                                SiStripConfigDb* const db ) 
   : CommissioningHistograms( pset.getParameter<edm::ParameterSet>("FineDelayParameters"),
-                             mui,
-                             FINE_DELAY ),
+                             bei,
+                             sistrip::FINE_DELAY ),
     CommissioningHistosUsingDb( db,
-                                mui,
-                                FINE_DELAY ),
-    SamplingHistograms( pset.getParameter<edm::ParameterSet>("FineDelayParameters"),
-                        mui,
-                        FINE_DELAY ),
-    tracker_(0)
-{
-  LogTrace(mlDqmClient_) 
-    << "[FineDelayHistosUsingDb::" << __func__ << "]"
-    << " Constructing object...";
-  delays_.clear();
-}
-
-// -----------------------------------------------------------------------------
-/** */
-FineDelayHistosUsingDb::FineDelayHistosUsingDb( const edm::ParameterSet & pset,
-                                                DQMStore* bei,
-						SiStripConfigDb* const db ) 
-  : CommissioningHistosUsingDb( db ),
+                             sistrip::FINE_DELAY ),
     SamplingHistograms( pset.getParameter<edm::ParameterSet>("FineDelayParameters"),
                         bei,
-                        FINE_DELAY ),
+                        sistrip::FINE_DELAY ),
     tracker_(0)
 {
   LogTrace(mlDqmClient_) 
diff --git a/trunk/DQM/SiStripCommissioningDbClients/src/LatencyHistosUsingDb.cc b/trunk/DQM/SiStripCommissioningDbClients/src/LatencyHistosUsingDb.cc
index 09b850a11cb68..e699297d5468d 100644
--- a/trunk/DQM/SiStripCommissioningDbClients/src/LatencyHistosUsingDb.cc
+++ b/trunk/DQM/SiStripCommissioningDbClients/src/LatencyHistosUsingDb.cc
@@ -1,4 +1,4 @@
-// Last commit: $Id: LatencyHistosUsingDb.cc,v 1.20 2009/09/04 09:57:41 lowette Exp $
+// Last commit: $Id: LatencyHistosUsingDb.cc,v 1.21 2009/11/02 18:52:51 lowette Exp $
 
 #include "DQM/SiStripCommissioningDbClients/interface/LatencyHistosUsingDb.h"
 #include "DataFormats/SiStripCommon/interface/SiStripConstants.h"
@@ -14,32 +14,16 @@ using namespace sistrip;
 // -----------------------------------------------------------------------------
 /** */
 LatencyHistosUsingDb::LatencyHistosUsingDb( const edm::ParameterSet & pset,
-                                            DQMOldReceiver* mui,
-					    SiStripConfigDb* const db )
+                                            DQMStore* bei,
+                                            SiStripConfigDb* const db )
   : CommissioningHistograms( pset.getParameter<edm::ParameterSet>("LatencyParameters"),
-                             mui,
-                             APV_LATENCY ),
+                             bei,
+                             sistrip::APV_LATENCY ),
     CommissioningHistosUsingDb( db,
-                                mui,
-                                APV_LATENCY ),
-    SamplingHistograms( pset.getParameter<edm::ParameterSet>("LatencyParameters"),
-                        mui,
-                        APV_LATENCY )
-{
-  LogTrace(mlDqmClient_) 
-    << "[LatencyHistosUsingDb::" << __func__ << "]"
-    << " Constructing object...";
-}
-
-// -----------------------------------------------------------------------------
-/** */
-LatencyHistosUsingDb::LatencyHistosUsingDb( const edm::ParameterSet & pset,
-                                            DQMStore* bei,
-					    SiStripConfigDb* const db )
-  : CommissioningHistosUsingDb( db ),
+                                sistrip::APV_LATENCY ),
     SamplingHistograms( pset.getParameter<edm::ParameterSet>("LatencyParameters"),
                         bei,
-                        APV_LATENCY )
+                        sistrip::APV_LATENCY )
 {
   LogTrace(mlDqmClient_) 
     << "[LatencyHistosUsingDb::" << __func__ << "]"
diff --git a/trunk/DQM/SiStripCommissioningDbClients/src/NoiseHistosUsingDb.cc b/trunk/DQM/SiStripCommissioningDbClients/src/NoiseHistosUsingDb.cc
index 3821035272a33..1e8c36520121e 100644
--- a/trunk/DQM/SiStripCommissioningDbClients/src/NoiseHistosUsingDb.cc
+++ b/trunk/DQM/SiStripCommissioningDbClients/src/NoiseHistosUsingDb.cc
@@ -1,4 +1,4 @@
-// Last commit: $Id: NoiseHistosUsingDb.cc,v 1.3 2009/04/06 16:52:42 lowette Exp $
+// Last commit: $Id: NoiseHistosUsingDb.cc,v 1.4 2009/06/18 20:52:37 lowette Exp $
 
 #include "DQM/SiStripCommissioningDbClients/interface/NoiseHistosUsingDb.h"
 #include "CondFormats/SiStripObjects/interface/NoiseAnalysis.h"
@@ -13,28 +13,12 @@ using namespace sistrip;
 // -----------------------------------------------------------------------------
 /** */
 NoiseHistosUsingDb::NoiseHistosUsingDb( const edm::ParameterSet & pset,
-                                        DQMOldReceiver* mui,
-					SiStripConfigDb* const db )
+                                        DQMStore* bei,
+                                        SiStripConfigDb* const db ) 
   : CommissioningHistograms( pset.getParameter<edm::ParameterSet>("NoiseParameters"),
-                             mui,
+                             bei,
                              sistrip::NOISE ),
     CommissioningHistosUsingDb( db,
-                                mui,
-                                sistrip::NOISE ),
-    NoiseHistograms( pset.getParameter<edm::ParameterSet>("NoiseParameters"),
-                     mui )
-{
-  LogTrace(mlDqmClient_) 
-    << "[NoiseHistosUsingDb::" << __func__ << "]"
-    << " Constructing object...";
-}
-
-// -----------------------------------------------------------------------------
-/** */
-NoiseHistosUsingDb::NoiseHistosUsingDb( const edm::ParameterSet & pset,
-                                        DQMStore* bei,
-					SiStripConfigDb* const db ) 
-  : CommissioningHistosUsingDb( db,
                                 sistrip::NOISE ),
     NoiseHistograms( pset.getParameter<edm::ParameterSet>("NoiseParameters"),
                      bei )
diff --git a/trunk/DQM/SiStripCommissioningDbClients/src/OptoScanHistosUsingDb.cc b/trunk/DQM/SiStripCommissioningDbClients/src/OptoScanHistosUsingDb.cc
index c921f6aef2d56..ff018fc296d2f 100644
--- a/trunk/DQM/SiStripCommissioningDbClients/src/OptoScanHistosUsingDb.cc
+++ b/trunk/DQM/SiStripCommissioningDbClients/src/OptoScanHistosUsingDb.cc
@@ -1,4 +1,4 @@
-// Last commit: $Id: OptoScanHistosUsingDb.cc,v 1.19 2009/06/18 20:52:37 lowette Exp $
+// Last commit: $Id: OptoScanHistosUsingDb.cc,v 1.20 2009/10/09 09:27:07 lowette Exp $
 
 #include "DQM/SiStripCommissioningDbClients/interface/OptoScanHistosUsingDb.h"
 #include "CondFormats/SiStripObjects/interface/OptoScanAnalysis.h"
@@ -12,16 +12,15 @@ using namespace sistrip;
 // -----------------------------------------------------------------------------
 /** */
 OptoScanHistosUsingDb::OptoScanHistosUsingDb( const edm::ParameterSet & pset,
-                                              DQMOldReceiver* mui,
-					      SiStripConfigDb* const db )
+                                              DQMStore* bei,
+                                              SiStripConfigDb* const db ) 
   : CommissioningHistograms( pset.getParameter<edm::ParameterSet>("OptoScanParameters"),
-                             mui,
+                             bei,
                              sistrip::OPTO_SCAN ),
     CommissioningHistosUsingDb( db,
-                                mui,
                                 sistrip::OPTO_SCAN ),
     OptoScanHistograms( pset.getParameter<edm::ParameterSet>("OptoScanParameters"),
-                        mui )
+                        bei )
 {
   LogTrace(mlDqmClient_) 
     << "[OptoScanHistosUsingDb::" << __func__ << "]"
@@ -33,21 +32,6 @@ OptoScanHistosUsingDb::OptoScanHistosUsingDb( const edm::ParameterSet & pset,
       << " Skipping db update of gain parameters.";
 }
 
-// -----------------------------------------------------------------------------
-/** */
-OptoScanHistosUsingDb::OptoScanHistosUsingDb( const edm::ParameterSet & pset,
-                                              DQMStore* bei,
-					      SiStripConfigDb* const db ) 
-  : CommissioningHistosUsingDb( db,
-                                sistrip::OPTO_SCAN ),
-    OptoScanHistograms( pset.getParameter<edm::ParameterSet>("OptoScanParameters"),
-                        bei )
-{
-  LogTrace(mlDqmClient_) 
-    << "[OptoScanHistosUsingDb::" << __func__ << "]"
-    << " Constructing object...";
-}
-
 // -----------------------------------------------------------------------------
 /** */
 OptoScanHistosUsingDb::~OptoScanHistosUsingDb() {
diff --git a/trunk/DQM/SiStripCommissioningDbClients/src/PedestalsHistosUsingDb.cc b/trunk/DQM/SiStripCommissioningDbClients/src/PedestalsHistosUsingDb.cc
index f470da478cc35..f0c2b096eec86 100644
--- a/trunk/DQM/SiStripCommissioningDbClients/src/PedestalsHistosUsingDb.cc
+++ b/trunk/DQM/SiStripCommissioningDbClients/src/PedestalsHistosUsingDb.cc
@@ -1,4 +1,4 @@
-// Last commit: $Id: PedestalsHistosUsingDb.cc,v 1.23 2009/06/18 20:52:37 lowette Exp $
+// Last commit: $Id: PedestalsHistosUsingDb.cc,v 1.24 2009/10/09 09:27:07 lowette Exp $
 
 #include "DQM/SiStripCommissioningDbClients/interface/PedestalsHistosUsingDb.h"
 #include "CondFormats/SiStripObjects/interface/PedestalsAnalysis.h"
@@ -13,16 +13,15 @@ using namespace sistrip;
 // -----------------------------------------------------------------------------
 /** */
 PedestalsHistosUsingDb::PedestalsHistosUsingDb( const edm::ParameterSet & pset,
-                                                DQMOldReceiver* mui,
-						SiStripConfigDb* const db )
+                                                DQMStore* bei,
+                                                SiStripConfigDb* const db ) 
   : CommissioningHistograms( pset.getParameter<edm::ParameterSet>("PedestalsParameters"),
-                             mui,
+                             bei,
                              sistrip::PEDESTALS ),
     CommissioningHistosUsingDb( db,
-                                mui,
                                 sistrip::PEDESTALS ),
     PedestalsHistograms( pset.getParameter<edm::ParameterSet>("PedestalsParameters"),
-                         mui )
+                         bei )
 {
   LogTrace(mlDqmClient_) 
     << "[PedestalsHistosUsingDb::" << __func__ << "]"
@@ -35,21 +34,6 @@ PedestalsHistosUsingDb::PedestalsHistosUsingDb( const edm::ParameterSet & pset,
     << highThreshold_ << "/" << lowThreshold_;
 }
 
-// -----------------------------------------------------------------------------
-/** */
-PedestalsHistosUsingDb::PedestalsHistosUsingDb( const edm::ParameterSet & pset,
-                                                DQMStore* bei,
-						SiStripConfigDb* const db ) 
-  : CommissioningHistosUsingDb( db,
-                                sistrip::PEDESTALS ),
-    PedestalsHistograms( pset.getParameter<edm::ParameterSet>("PedestalsParameters"),
-                         bei )
-{
-  LogTrace(mlDqmClient_) 
-    << "[PedestalsHistosUsingDb::" << __func__ << "]"
-    << " Constructing object...";
-}
-
 // -----------------------------------------------------------------------------
 /** */
 PedestalsHistosUsingDb::~PedestalsHistosUsingDb() {
diff --git a/trunk/DQM/SiStripCommissioningDbClients/src/PedsFullNoiseHistosUsingDb.cc b/trunk/DQM/SiStripCommissioningDbClients/src/PedsFullNoiseHistosUsingDb.cc
index f8a95436a0e0b..9967fa2166f2f 100644
--- a/trunk/DQM/SiStripCommissioningDbClients/src/PedsFullNoiseHistosUsingDb.cc
+++ b/trunk/DQM/SiStripCommissioningDbClients/src/PedsFullNoiseHistosUsingDb.cc
@@ -1,4 +1,4 @@
-// Last commit: $Id: PedsFullNoiseHistosUsingDb.cc,v 1.23 2009/06/18 20:52:37 lowette Exp $
+// Last commit: $Id: PedsFullNoiseHistosUsingDb.cc,v 1.1 2009/11/03 17:48:16 wto Exp $
 
 #include "DQM/SiStripCommissioningDbClients/interface/PedsFullNoiseHistosUsingDb.h"
 #include "CondFormats/SiStripObjects/interface/PedsFullNoiseAnalysis.h"
@@ -13,40 +13,27 @@ using namespace sistrip;
 // -----------------------------------------------------------------------------
 /** */
 PedsFullNoiseHistosUsingDb::PedsFullNoiseHistosUsingDb( const edm::ParameterSet & pset,
-                                                        DQMOldReceiver* mui,
-                                                        SiStripConfigDb* const db )
-  : CommissioningHistograms( 	pset.getParameter<edm::ParameterSet>("PedsFullNoiseParameters"),
-                             	mui,
-                             	sistrip::PEDS_FULL_NOISE ),
+                                                        DQMStore* bei,
+                                                        SiStripConfigDb* const db ) 
+  : CommissioningHistograms( pset.getParameter<edm::ParameterSet>("PedsFullNoiseParameters"),
+                             bei,
+                             sistrip::PEDS_FULL_NOISE ),
     CommissioningHistosUsingDb( db,
-                                mui,
                                 sistrip::PEDS_FULL_NOISE ),
-    PedsFullNoiseHistograms( 	pset.getParameter<edm::ParameterSet>("PedsFullNoiseParameters"),
-                             	mui ){
-  LogTrace(mlDqmClient_) 
+    PedsFullNoiseHistograms( pset.getParameter<edm::ParameterSet>("PedsFullNoiseParameters"),
+                             bei )
+{
+    LogTrace(mlDqmClient_) 
     << "[PedsFullNoiseHistosUsingDb::" << __func__ << "]"
     << " Constructing object...";
   highThreshold_ = this->pset().getParameter<double>("HighThreshold");
   lowThreshold_ = this->pset().getParameter<double>("LowThreshold");
-  edm::LogInfo(mlDqmClient_)
+  LogTrace(mlDqmClient_)
     << "[PedsFullNoiseHistosUsingDb::" << __func__ << "]"
     << " Set FED zero suppression high/low threshold to "
     << highThreshold_ << "/" << lowThreshold_;
 }
 
-// -----------------------------------------------------------------------------
-/** */
-PedsFullNoiseHistosUsingDb::PedsFullNoiseHistosUsingDb( const edm::ParameterSet & pset,
-                                                        DQMStore* bei,
-                                                        SiStripConfigDb* const db ) 
-  : CommissioningHistosUsingDb( db,sistrip::PEDS_FULL_NOISE ),
-    PedsFullNoiseHistograms(pset.getParameter<edm::ParameterSet>("PedsFullNoiseParameters"),bei ){
-  	
-    LogTrace(mlDqmClient_) 
-    << "[PedsFullNoiseHistosUsingDb::" << __func__ << "]"
-    << " Constructing object...";
-}
-
 // -----------------------------------------------------------------------------
 /** */
 PedsFullNoiseHistosUsingDb::~PedsFullNoiseHistosUsingDb() {
diff --git a/trunk/DQM/SiStripCommissioningDbClients/src/PedsOnlyHistosUsingDb.cc b/trunk/DQM/SiStripCommissioningDbClients/src/PedsOnlyHistosUsingDb.cc
index ce8a2f2aab987..76bdb8cdd9a74 100644
--- a/trunk/DQM/SiStripCommissioningDbClients/src/PedsOnlyHistosUsingDb.cc
+++ b/trunk/DQM/SiStripCommissioningDbClients/src/PedsOnlyHistosUsingDb.cc
@@ -1,4 +1,4 @@
-// Last commit: $Id: PedsOnlyHistosUsingDb.cc,v 1.5 2009/04/06 16:52:42 lowette Exp $
+// Last commit: $Id: PedsOnlyHistosUsingDb.cc,v 1.6 2009/06/18 20:52:37 lowette Exp $
 
 #include "DQM/SiStripCommissioningDbClients/interface/PedsOnlyHistosUsingDb.h"
 #include "CondFormats/SiStripObjects/interface/PedsOnlyAnalysis.h"
@@ -13,28 +13,12 @@ using namespace sistrip;
 // -----------------------------------------------------------------------------
 /** */
 PedsOnlyHistosUsingDb::PedsOnlyHistosUsingDb( const edm::ParameterSet & pset,
-                                              DQMOldReceiver* mui,
-					      SiStripConfigDb* const db )
+                                              DQMStore* bei,
+                                              SiStripConfigDb* const db ) 
   : CommissioningHistograms( pset.getParameter<edm::ParameterSet>("PedsOnlyParameters"),
-                             mui,
+                             bei,
                              sistrip::PEDS_ONLY ),
     CommissioningHistosUsingDb( db,
-                                mui,
-                                sistrip::PEDS_ONLY ),
-    PedsOnlyHistograms( pset.getParameter<edm::ParameterSet>("PedsOnlyParameters"),
-                        mui )
-{
-  LogTrace(mlDqmClient_) 
-    << "[PedsOnlyHistosUsingDb::" << __func__ << "]"
-    << " Constructing object...";
-}
-
-// -----------------------------------------------------------------------------
-/** */
-PedsOnlyHistosUsingDb::PedsOnlyHistosUsingDb( const edm::ParameterSet & pset,
-                                              DQMStore* bei,
-					      SiStripConfigDb* const db ) 
-  : CommissioningHistosUsingDb( db,
                                 sistrip::PEDS_ONLY ),
     PedsOnlyHistograms( pset.getParameter<edm::ParameterSet>("PedsOnlyParameters"),
                         bei )
diff --git a/trunk/DQM/SiStripCommissioningDbClients/src/VpspScanHistosUsingDb.cc b/trunk/DQM/SiStripCommissioningDbClients/src/VpspScanHistosUsingDb.cc
index 7b2fa4758df84..d2b6498739767 100644
--- a/trunk/DQM/SiStripCommissioningDbClients/src/VpspScanHistosUsingDb.cc
+++ b/trunk/DQM/SiStripCommissioningDbClients/src/VpspScanHistosUsingDb.cc
@@ -1,4 +1,4 @@
-// Last commit: $Id: VpspScanHistosUsingDb.cc,v 1.18 2009/04/06 16:52:42 lowette Exp $
+// Last commit: $Id: VpspScanHistosUsingDb.cc,v 1.19 2009/06/18 20:52:37 lowette Exp $
 
 #include "DQM/SiStripCommissioningDbClients/interface/VpspScanHistosUsingDb.h"
 #include "CondFormats/SiStripObjects/interface/VpspScanAnalysis.h"
@@ -12,27 +12,13 @@ using namespace sistrip;
 // -----------------------------------------------------------------------------
 /** */
 VpspScanHistosUsingDb::VpspScanHistosUsingDb( const edm::ParameterSet & pset,
-                                              DQMOldReceiver* mui,
-					      SiStripConfigDb* const db ) 
+                                              DQMStore* bei,
+                                              SiStripConfigDb* const db ) 
   : CommissioningHistograms( pset.getParameter<edm::ParameterSet>("VpspScanParameters"),
-                             mui,
+                             bei,
                              sistrip::VPSP_SCAN ),
     CommissioningHistosUsingDb( db,
                                 sistrip::VPSP_SCAN ),
-    VpspScanHistograms( pset.getParameter<edm::ParameterSet>("VpspScanParameters"),
-                        mui )
-{
-  LogTrace(mlDqmClient_) 
-    << "[VpspScanHistosUsingDb::" << __func__ << "]"
-    << " Constructing object...";
-}
-
-// -----------------------------------------------------------------------------
-/** */
-VpspScanHistosUsingDb::VpspScanHistosUsingDb( const edm::ParameterSet & pset,
-                                              DQMStore* bei,
-					      SiStripConfigDb* const db ) 
-  : CommissioningHistosUsingDb( db, sistrip::VPSP_SCAN ),
     VpspScanHistograms( pset.getParameter<edm::ParameterSet>("VpspScanParameters"),
                         bei )
 {